Merge "Revert "Tag FTS3 cursor pointers in fts3ColumnMethod()" am: 04b71930 am: 8864d13b am: b8758ffc am: 23756c7f am: 5a5ec9c6 am: 45b73a14 -s ours am: 960b028a -s ours" into oc-dr1-dev-plus-aosp