Merge "Convert ext.jar to Android.bp" am: 42156f3e56 am: 8feea076a2
am: faededa6af

Change-Id: I9e640ea1f6175306c74075e25485bce622d6ca52