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

Change-Id: Ib02aadc15c67d2bac9e20993afdad93e5b42c20b