Merge "Convert Android.mk file to Android.bp"
am: c6ef1d2dc0

Change-Id: Id0872e42b5eda65e34c4f55d24420463b6bcefad