Merge "Convert to Android.bp"
am: 10348cbeb9

Change-Id: Ica8fd833a664df6255f3835f2c755751bb98f8d5