am 7d6bc4d0: Merge "[CS1] Some initial clean up"

* commit '7d6bc4d06394bf3fc6574c2a8c5e077a91834961':
  [CS1] Some initial clean up
tree: c3248e2c9c198150878ac5cae74c7106bdeea5b0
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk