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

Change-Id: Ibb8fc0c8ce3cc10cd8140d75ab832ac4631caf1e