Merge changes Ie8b78c7c,If02081d2

* changes:
  Use the class loader context when optimizing secondary dex files
  Add DexClassLoader to the list of supported class loaders