am a828f613: Merge "Some more simplification"

* commit 'a828f613a8dfbeff6290f261bbbd5ff988fb99b6':
  Some more simplification
tree: 4e176ad1e3d8b015a977d8c0423f17f71e7f78ff
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk