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: 17367100 Change-Id: I31c5c827b5d224bda8b93f79f79cd19d545790ba