Convert to Android.bp am: a7822da616 am: 71da9da58b am: dcecd1f178

Change-Id: I3f35410e70a00ced6bebaa8a3a4505ed3571e895