Merge "Convert Android.mk to Android.bp" am: 0bbba1b525
am: a9db5cc452

Change-Id: I724870a91ff32c33ad2f65b53fc033e53c60ec79