Merge changes from topics 'cts_jvmti_intrinsics_test', 'cts_jvmti_at_hide_fixes' am: 22a4837770
am: 0e85c69458

Change-Id: I7dfcf488f2481865d9a229f729a9eddd08b473b1