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

* commit '064b78385fa24d8d0c942a25625db67dd338ce25':