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

Change-Id: I62f92c1a7d30f10c7193b25eb42b98df076d9a75