Merge "Convert to Android.bp" am: a50b46b7bb
am: 8651f91fbd

Change-Id: Icdd020775d7a6950f2bcd9450b5acd969add46d0