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

Change-Id: Id2d50d468dd94fe07d6d4ee93d878199aaaf949e