Merge "Merge "Convert Android.mk file to Android.bp" am: 190ff7457c am: 4bb2c54698 am: 8d838a3ced"