DO NOT MERGE - fix FTS3 column pointer handling am: f856b320 am: f8d9fa15 am: adf7753f am: 02570cea am: 528bdd20 -s ours am: b8c15440 am: abd39267 am: 13942a4b am: b5c0508b -s ours Change-Id: I2ddae63ac5f0b60c8e80900d29e4b10e4f4d72d3