Merge "Convert to Android.bp" am: d81c8f2604
am: 5cbed885dd

Change-Id: I3e22c05a39923da8e6d5718e077327dd53a6e438