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

* commit '4726f7d3f8143497c75bc021dec8a11b05483c07':