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

Change-Id: Ib3b8418538770b1f57106f3c14c296845d796a1c