Merge "Fix stripping of access flags during JVMTI redefine" am: 8566e36b76
am: d278e413ce

Change-Id: I62a7bcdb942266bb0af64b5f907a8b7f62d02775