Merge "Remove voodoo magic."
tree: a1589c11793925a4c08d757982e6927e3262a932
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk