Merge "Move another field away from android_atomic_cas."