Merge "Convert to Android.bp" am: 9c3af9383f
am: ce313a52f2

Change-Id: I3165805de3d13218cf9ebb1b8d3bbf025e9ade06