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

Change-Id: Ied0a13e96c1f929d5b38a59689b20d1795e86602