Merge "Convert Android.mk to Android.bp" am: b946ef9061
am: 5c0b96faf3

Change-Id: I6a41cab0b037da688f8e5742e1dc2fda9978f467