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