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

Change-Id: Ief7e29323684778306dcfcc3850bfa7772e94bbb
Merge "nist-pkix-tests should only depend on core and core-junit, not frameworks"
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
Merge tag 'tags/android-4.4_r1' into kitkat-staging

Android 4.4 Release 1.0