Better naming for created archives.

If compressing only one file/directory use that file/directory's
name as the archive file name.

Test: Tested manually.
Bug: 20822019
Change-Id: Icb3e3d816204f300b3d97c7fe571e7568b5a9921
(cherry picked from commit 6a5c723a)