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

Change-Id: I2e9abcf2d9e8b3f17c51b898bacaf61ea848519d