Merge "Convert to Android.bp"
am: e6b6ae65df

Change-Id: I73f38e8c843967109fb7f9b9624bf6df92ad01c4