Merge "Convert Android.mk file to Android.bp" am: 1c2c11990c
am: 1b1553fbe0

Change-Id: Ia6fca0b09a2366b5a9b6f0a798154c498dd969c5