am b296c6bd: am 82001c65: am 2929490d: Merge "Move card table away from android_atomic_cas."

* commit 'b296c6bd94f33b91b2c2a2286d25b6b4ffd65a0e':