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

Change-Id: Iaef1eb20677b75e311a4c5af9915adf63ca38e79