Merge "Convert to Android.bp" am: e6be5fc431 am: 481030b1e2 am: 48dadcacc3
am: e9988801e9

Change-Id: I17c32b5201c7edff637214f106ee8a390496d3f3