Merge "Add jvmti redefinition tests." am: d534cd17fa
am: f51082a53f

Change-Id: Ica989daf5e01af0df1a141b65db5009f99f6ed1a