am 31123c6f: Merge commit \'85484a42\' into manualmerge

* commit '31123c6f8cd489707210c66040aec66c1250af31':
  sqlite: upgrade to SQLite 3.8.6.1 - DO NOT MERGE
tree: 10f1b8f650e17db127a02e0f9a35675efab41ac0
  1. CleanSpec.mk
  2. android/
  3. dist/