Merge "Convert Android.mk file to Android.bp"
am: 190ff7457c

Change-Id: I386b44574ddb4b946536805c467c0c46333f2fa8