Merge "Fix hidden API CTS tests' JNI checks" into pi-dev