Android S Beta 5
Merge "Convert tests/Android.mk to Android.bp"