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

* commit 'f95e89a00ed1a2e69c00f30ffed517e17ffd2956':
  Move another field away from android_atomic_cas.