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

Change-Id: Ia175bec1504f2834f61d8a686182b3f7921d64e2