DO NOT MERGE - fix FTS3 column pointer handling am: 7d8204e5 am: 60c85944 -s ours am: 5078903e am: 0adcdd2a am: 3fbf39ee Change-Id: Ia8e7b475ae23ae959c23fe3c104767a0ad2f2557