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

Change-Id: I87d0b038195ac9b7cd1d3551bd1de2b5c2fadbf2