am 1e516fae: am 2dacab3a: am a0f17e18: am 2929490d: Merge "Move card table away from android_atomic_cas."

* commit '1e516faeb3b9983933b6322409f6ed34203b8118':