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

Change-Id: Ice1239fb94172105d20e24a80966a0d9008934e3