Merge "Convert Android.mk file to Android.bp" am: 9d9163f90c
am: 5bdef0eb24

Change-Id: I74b1f02f9f2874772a0317fc7f828fa363800237