DO NOT MERGE - fix FTS3 column pointer handling am: a378abb5 -s ours am: 5e2ac063 am: 5a53058d -s ours am: 496c7733 Change-Id: Icf46769bb4fc84cf71b24c1ccc40f74cb15578af