Merge "Add TEST_MAPPINGs for remaining java.* packages."