Merge "Convert to Android.bp" am: 926a9ca483 am: 036ff47227
am: 1bfd896f16

Change-Id: I1dfc4fa629548cc7dc77b8e584e56f1382903bd0