Merge "Convert to Android.bp" am: a4c863fab6
am: 29ea54f068

Change-Id: I6d5e2c1c23684df284727e4194bc5eae02fae025