Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain""