Merge "Revert^2: Hiddenapi tests: skip JNI on clinit error" into pie-cts-dev