Merge "Convert Android.mk file to Android.bp" am: 8322bd4f72 am: 6d180d8c97
am: 4563d12272

Change-Id: Ib6eae10dd5f376495c5cc9b0afd4965b12686b9a