am b592e085: Merge "openssl-1.0.1e upgrade"

# Via Brian Carlstrom (1) and Gerrit Code Review (1)
* commit 'b592e0854049cd931a0ffecd340f216dbef59ca8':
  openssl-1.0.1e upgrade