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

* commit '0fd207a3d6a54b753951d5a80e56f39eefe146be':