Merge "Convert Android.mk file to Android.bp"
am: 0c3aca9360

Change-Id: I65d980e3f7e0327109d32aedec4e962c5c10cd1f