DO NOT MERGE - fix FTS3 column pointer handling am: 0f98d879 -s ours am: 42ab1dbb am: 1ddf421e am: f374392b -s ours Change-Id: I0d20ff2b9a937c54ea13eda09023e731a3f47a32