Merge "Keep pointer to original DexFile during JVMTI redefine for hiddenapi"