DO NOT MERGE - fix FTS3 column pointer handling am: 2f5d96a7 am: 3e44e09e...

DO NOT MERGE - fix FTS3 column pointer handling am: 2f5d96a7 am: 3e44e09e am: 79d1e1f4  -s ours am: 6ae19d4d  -s ours am: 2a598562 am: 8129fd1b  -s ours am: f5f93b5f am: 60b77e7c am: 18325995 am: cf9e2628  -s ours am: ae7306c4 am: a03f33ca am: 4604adb4 am: b8b9cf5a am: 6bc929f3  -s ours am: 065e78b9 am: ca9ebcec
am: 319532e2

Change-Id: I9a58980b220501cf88afa03356dac854b68c4416