DO NOT MERGE - fix FTS3 column pointer handling am: 7d8204e5 am: 60c85944 -s ours am: 5078903e am: 0adcdd2a Change-Id: I72376c3b5fde8ed030d4fe5894eb34632dcb42c3