Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c810 am: a927501359 am: 3dbb547fc2 am: 3d280462b5 am: 43a669ddff

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

Change-Id: I3dbc7b79c5b0f0f3bd059b2c784eb14d01f553ab