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

* commit '0128ddcd69c1ab1346046cc34f911d7ea5286f72':