am f1affb13: am d9adda97: Merge "Update softkeymaster for BoringSSL."

* commit 'f1affb13e6a36590b7d32b1981290c947420c64b':