Merge "Convert Android.mk file to Android.bp" am: 9f37180f92
am: 8383a2c879

Change-Id: Ie76e3b4ab7a613b4f5a743dfb8e29dad896b375a