Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev
tree: ecdc8a3345ce11b2800de925518ba010460b7340
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk