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

Change-Id: I7247bc55f387b8305b5752b9b9ed0a22ad3f58c9