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

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