Merge "Convert to Android.bp" am: a4c863fab6 am: 29ea54f068 am: d32d6b321e
am: 14fe7583c3  -s ours

Change-Id: I5cb207d35d2d12e2c51fb3abea9fd221fcfc1676