Merge "Add a temporary hack to let BoringSSL build with a new compiler."
am: 8ed0cbc562

Change-Id: I3e61013fd5706795cd2d02a56ae021f944c87e57