Merge "nist-pkix-tests should only depend on core and core-junit, not frameworks"