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

* commit 'b1f68c182b43fc98c816550ee88de21a713a30b9':