Android 6.0.0 release 26
Merge "nist-pkix-tests-host is a dalvik static library"