Merge "Keep pointer to original DexFile during JVMTI redefine for hiddenapi" am: 95eeb395 am: 4a6f3ebf am: 7fb9b576 Change-Id: I757928aa79b1d17be94fe514a26984ca62acf86e