Merge "Convert Android.mk file to Android.bp"
am: 504a33a64e

Change-Id: I464c162ef26998c2c1c968e9da36b35fa36eabb1