Merge "Fix PKIXCertPathValidatorSpiTest" into froyo