Merge "Convert Android.mk file to Android.bp" am: bac50c02f3 am: 2f9c9126c5
am: 744f753795

Change-Id: I4a3095f083cc24fc7dddb7da1a7e845ad121aa00