Merge "Add TEST_MAPPINGs for javax.* packages."