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

Change-Id: Icb72ff3997c59a605f7339014b48c8eb4ee13795