To bionic: 06366724d572ef005f5bc0ddd8ad46794cbfad3b Change-Id: I4c676127d357445fc5d09a2c82c5664238105b90
at temp. android-20 folders Change-Id: Iecdb083ba1b1c239bd5ecafda56356466e590565