Merge "convert Android.mk to Android.bp" am: c669370651
am: b8f5bc6788

Change-Id: Ifa4bdfae3e7d52b9068cb2fa804af14f077b3493