Test: Run with internal cl https://googleplex-android-review.git.corp.google.com/#/c/2028102/ and make sure passes Bug: 20890063 Change-Id: Id78e5ea843554a5d3750b8f9b350f28ad4dca99b
Also switch to Android.bp Bug: N/A Test: builds Change-Id: I33697a40b30d071f8d07aa33e1fb2b0c6e8a9f6d