DO NOT MERGE - fix FTS3 column pointer handling am: a378abb509  -s ours am: 5e2ac063eb
am: 5a53058d84  -s ours

Change-Id: I823833ae46b4803445ae629d8eb5a5ed3f2578a4
tree: 10f1b8f650e17db127a02e0f9a35675efab41ac0
  1. android/
  2. dist/
  3. CleanSpec.mk