Merge \"Convert Android.mk to Android.bp\"
am: f47bfd7f77

Change-Id: I9aea1a844c568ae72864f898accdf6a259472c00