Merge "Convert apps/**/Android.mk file to Android.bp" am: 280cb4f027 am: fd38a543aa am: 7c0f496d44
am: 7112465c7a

Change-Id: I7bba6e54dc00f436d2f92f846bd924c512e23a5d