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

Change-Id: Icb4ff3be94149b7b6338c125bfc098d7853f196a