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

* commit '43b6fe0270477cd47f8dd8b064d006961a44be54':
  Move another field away from android_atomic_cas.