Merge "DO NOT MERGE - fix FTS3 column pointer handling" into mnc-dev am:...

Merge "DO NOT MERGE - fix FTS3 column pointer handling" into mnc-dev am: 13ee0c2a am: f3cda0f0 am: 7449e920 am: cc5c1b86  -s ours am: e24d236e am: 8fee7655 am: 0b61aeb4 am: c5c3de6f am: d22c17f1  -s ours am: 4aedd1f2 am: a53dfe88 am: 7bf44f2f
am: 1e70673f  -s ours

Change-Id: I0803d0f2beec8f6b8e5483116a4e860516d164bd