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

Change-Id: I89cf3209176aa2944ca068bf35aedce33711e23c