Correct fix for undeleted analysis files.

In scala compilation, pants generated temporary files during
the process of merging, splitting, and rebasing analysis files.
These files weren't being cleaned up correctly.

This change fixes the two reasons for the lingering files:
(1) Zinc generates two kinds of analysis files: java serialization files,
  and textual relations files. In some operations, the serialization files
  were being cleaned up, but the textual relations files.
(2) In some cases, the automatic temp file cleanup used for
  removing the analysis files when they are no longer needed
  was disabled.

In manually observed test runs, no analysis files were left
after pants completed.

Auditors: benjy
Cc: tdyas