Android S Beta 1
Merge "Convert src/main/Android.mk to Android.bp"