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