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

* commit '7da567ca9133cb3a702f793ee5239b6d9841087a':