Merge "More simplification"
tree: 9933acd2c6c2c33c12ac448374e900771bb48618
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk