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: 3dac9a31 am: 780b51e6 -s ours Change-Id: I19a3a81e476d1c0ac34e649750abebd59a7e87e2