Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." am: 414d53442e am: 80809d6d5a
am: 63522e8f02

Change-Id: I2e8bb7fd221c21d87527d2c11b19433bcacd808d