Revert "Separate spacing and punctuation related settings values"

This is conflicting with later changes. Temporary revert for cherry-pick.

This reverts commit 0b593ce858d4b406e949f0e809cb77f41da691f9.

Change-Id: Id53eadb023a950cfcca496c0cfbfe583c7ec7b8c
6 files changed
tree: 3552103a95246e2f62f5c239b93ea20b2fafb3dd
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk