am a550fba3: More fixes for BoringSSL compilation.

* commit 'a550fba3d26d878873956f128de7607ff4cc96e4':
  More fixes for BoringSSL compilation.