Merge "Convert Android.mk files to Android.bp" am: 1ccb28f28a am: aabc1be2ea am: dc5a7ea905
am: f29f5cb2c5

Change-Id: I2709ce74f52290b452cee8ab5492903dcdf10a92