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

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