Merge "Convert to Android.bp" am: c103bea5b9
am: 94adbdcf75

Change-Id: Ib2a5dbf18d89b1feff5c8d5638f7719cee48f209