Merge "Straighten out the last bastion of the Builder"
tree: 2944afc5632db5a73116d3b951a05133822b5b16
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk