Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev

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