Merge "Convert to Android.bp" am: e6b6ae65df
am: f2895a0b3e

Change-Id: I6406a4dbe6286b1570a36a66657d9d121c63e422