DO NOT MERGE - fix FTS3 column pointer handling am: 7d8204e5ca
am: 60c85944f7  -s ours

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