Merge "Convert Android.mk file to Android.bp"
am: 86598f6ab5

Change-Id: Ida440b123cae70f75020f0df553ebf08dfc0bde1