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

* commit 'befae3aad951656ca44fec38aa33fc4403c7a33e':
  nist-pkix-tests should only depend on core and core-junit, not frameworks