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