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

* commit 'b284a825ed092f34c31d764feb2c9ac23bc8acf0':