Includes changes to openssl.config not present in the original commit. Bug: 17750026 (cherry-picked from commit 9a68a8fb) Change-Id: I41789367e1d4c24f26838132c1a38ad5ad33c8e4