DO NOT MERGE - fix FTS3 column pointer handling am: f856b320 am: f8d9fa15 am: adf7753f am: 02570cea am: 528bdd20 -s ours am: b8c15440 am: 23d916c9 am: 17367100 am: e6a6db46 -s ours Change-Id: I77e8924b252b2df0594521e99ed940552632a21b