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