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

Change-Id: I362e99a5d9605e0e9b8f890e60302f7de5a823fe