Merge "Run BORINGSSL_self_test() in updater_main" am: 8316f2f09a am: 0b89939ddf
am: 49e732cf65

Change-Id: Ie9616bcce2f6a9b0f49e0925bc572e9e8d077e40