Merge "Convert Android.mk file to Android.bp" am: 058cb93644 am: c044eea3fc
am: 98bf6d7ecf

Change-Id: I9e3c37fc8b719f0e9bc0b39ded934d5118a62bc1