DO NOT MERGE - fix FTS3 column pointer handling
am: a378abb509  -s ours

Change-Id: Iae857d1dba8bc0ee6689d685659e2f6328535b87