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 Change-Id: I2d59fd505a25f2ac7ee4a584a5c7135cde4134b5