am faee53c0: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'faee53c0880c637acd9bf23b4a7aadeeb4a50085':
  Revert "Correctly add double quote to the space strippers"
  Revert "Only add spaces automatically when appropriate."
tree: 48edbe05035d91549c0020214047c914dec84215
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk