am af4cf5d7: Merge "Missed use of android_atomic and thread state_."

* commit 'af4cf5d72a2bf77f0e442bedb208f9227f262c89':
  Missed use of android_atomic and thread state_.