(fixup) fix jdk-test
(fixup) fix bootimage build