Merge "Remove 64-bit android_atomic uses from StateQueue."