Merge "Simplification again (A5)" into jb-mr1-dev
tree: 3fd2771f3a035e2380280811b61e258dbf044d66
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk