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

* commit '433df2a55d73eff73f16aa9e1609bf07d329b88a':