Merge "Run BoringSSL self test during startup" am: 044e02764d
am: 1500940065

Change-Id: I2dbfbc56512b2a9a7f0ef0f75b5731acae38e414