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

* commit 'bba7e9c99a5aa72e4d6a05488216936ca4722d0e':