Merge "Adjust JVMTI tests for new hiddenapi policies" am: c239fa9548
am: 4b7fb78443

Change-Id: I934be65728b9489b93d0dbb406f7b6106bc74dd2