Merge "Convert Android.mk file to Android.bp"
am: 9f37180f92

Change-Id: I673a59cadf86ef712f1fcf0e397a0a122585834a