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

Change-Id: I2c2c5ccb7da321ee7896e01131f84090797eb6db