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

Change-Id: I4bbb674d75f089f66a3744a6341cf999054c429c