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

Change-Id: Ic6c3b63a6f21a8af4527406db163698fdf47c642