am 979f4040: am 064b7838: am 43b6fe02: Merge "Move another field away from android_atomic_cas."

* commit '979f404007a3341bc6d6de4afa9342252552dc3c':