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

Change-Id: I0cd57d365985a4e0031848bceaee8bccdf2e563e