Merge commit 'd4cdb357' into gingerbread-plus-aosp * commit 'd4cdb357': Update the card table scanning for header-only card marks.