[automerger skipped] Merge BoringSSL commits for WiFi fixes am: db586b6668  -s ours
am: 812209884e  -s ours

Change-Id: I11e563460933130c11be512919e5fd2cd4018edd