Merge "Convert Android.mk file to Android.bp"
am: 058cb93644

Change-Id: I65c74c81e932b3fcb08f80f4c6454d960943811d