Merge "Convert Android.mk file to Android.bp" am: f526e6009b
am: eb886a265f

Change-Id: I01d87c0b2e5681dd37d7d3d405c77a23c9b0e13d