DO NOT MERGE - fix FTS3 column pointer handling am: 7d8204e5ca am: 60c85944f7  -s ours am: 5078903e16 am: 0adcdd2a02 am: 3fbf39ee9c
am: 754653e051  -s ours

Change-Id: I401bcbf639e1f4d9c38319ee1e6bc1c9e3415913
tree: d3100f55781eaabcc57efe3b590bdc62990b58f9
  1. android/
  2. dist/
  3. CleanSpec.mk
  4. README.version