am cf42d2eb: am 86437bbb: am fbee7f97: am f8d4dfbf: Merge "Cherry-pick: Only use <atomic> for C++11 and newer"
* commit 'cf42d2eb47945f73145e2fddcdd1d2ecbc32b976':
This commit is contained in: