Merge "Fix InsertDexFileInToClassLoader to handle null class loaders" am: e4010c6 am: 8a81b94
am: 4be9b2e

* commit '4be9b2e4fb7a8c83b83a88fde336f113f77df471':
  Fix InsertDexFileInToClassLoader to handle null class loaders

Change-Id: I1f91d6009cdc84920b08fe69e62fffca5b9ba08b