Merge "Merge changes from topics 'cts_jvmti_intrinsics_test', 'cts_jvmti_at_hide_fixes' am: 22a4837770" into stage-aosp-master
am: 1d1ad40075

Change-Id: I0034330924a17e58ed7820c4ba3dfe9ca4facc34