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

Change-Id: I1a03beb83047687f6a520bc632ef7675ed9680a0