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

Change-Id: I5aeb238974545f6bc7d3ea468eb551d7dceb86bf