DO NOT MERGE - fix FTS3 column pointer handling am: 2f5d96a7 am: 3e44e09e am: 79d1e1f4 -s ours am: 6ae19d4d -s ours Change-Id: If1fe4d94a2d945e9e76418f2e7e20f7053d1709a