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

Change-Id: Ic1a47ff497442bf740fa251c0c3429bdb15eb81d