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

Change-Id: I938bdb6cf443f97895427e71f75e11f15ae5e7e8