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

Change-Id: Id449eb6abbaf3676c88e1cd4ddb2ec230589218e