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

DO NOT MERGE - fix FTS3 column pointer handling am: a378abb5  -s ours am: 5e2ac063 am: 5a53058d  -s ours am: 496c7733 am: 7d087054 am: a5c7ebde am: 6c24975b  -s ours am: 86cb683a am: 93b84b5e am: 9c905276 am: 5e7bb29c am: 12277912  -s ours am: 33da7f5e am: 95611601 am: bbcf0d2c
am: adf95c54  -s ours

Change-Id: I0552fa0b26b0bfa2d25419977a6d9e4c77b455db