Merge "Convert Android.mk file to Android.bp"
am: 7c18b9609f

Change-Id: I5c4e964b3e411631c2ce936e95e795b214499bf9