Merge "Convert apps/**/Android.mk file to Android.bp"
am: 280cb4f027

Change-Id: Ifcaaf87d9068684af73fc53e23987ee96164a877