am a7c75d1b: am 2d7ec9d7: Merge "Fix build with clang in C++11 mode"

* commit 'a7c75d1b17556d9842a7823c94a2c96982687c63':
  Fix build with clang in C++11 mode