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

* commit '8a81b947208f74d0a863077670bad1ba378681f5':
  Fix InsertDexFileInToClassLoader to handle null class loaders

Change-Id: Ib70bcabeff671bffef949c51dc6039dd553e3470