DO NOT MERGE - fix FTS3 column pointer handling am: f856b320 am: f8d9fa15 am: adf7753f am: 02570cea am: 528bdd20 -s ours am: b8c15440 Change-Id: Ia4d98799a8eeb29b649d8503d9a118f6c3f8cc58