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

Change-Id: Ic4a9e6d41dd9932bb99310e73d99e3bb158983c4