Android S Beta 3
Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211

Change-Id: Ic8c3a89b04ad07e763be1a98f534cb3efcdd815a