Merge "Convert Android.mk to Android.bp" am: 64b8511941 am: 880a6ba188 am: 859f63e840

Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I713c1a354f33d6fc9e6d140d309c4b8e728c50a2