Merge "Fix stripping of access flags during JVMTI redefine"