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

Change-Id: I7db0fc0e79fdc0301f80b45c2001ec55031b137e