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

Change-Id: Ibd2b03c24eee63d2f270626ebce1d4b508f0d4cf