Merge "Convert to Android.bp" am: 65631cf079
am: 8c3849a15d

Change-Id: I9bb0b6f5f02a0f7c117228d24a013254a2a41bba