Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c810 am: a927501359 am: 3dbb547fc2 am: ad478bcd67 am: e092d2a1db

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

Change-Id: I9184789540a4d8854cfc3c77bf237e72bf3f3f2b