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

Change-Id: I3554df43c126f74c8dff3d7ffae5b2777393d2cd