Merge "Fix the default ownership of dex files in ClassLoaderContext" am: 4ce0f9a270
am: fd2ed69bd9

Change-Id: If3f80899de54d056bef0ff2b81e04e4c1a223d95