Merge "Convert Android.mk file to Android.bp"
am: 4e06707a71

Change-Id: I702e17f9dac1c8a9c87af1d02d2e1cea13bfbb73