Revert "Refactor zipalign to allow unit tests"

This reverts commit d4f71a97bd.

Reason for revert: Looks to have broken apsp master b/171754371

Change-Id: I17ec7ab20834f6b0dbdf49668c41d3e76c0c1e41

tools/zipalign/ZipEntry.cpp

@@ -29,7 +29,7 @@
 #include <string.h>
 #include <time.h>
 
-namespace android {
+using namespace android;
 
 /*
  * Initialize a new ZipEntry structure from a FILE* positioned at a
@@ -696,5 +696,3 @@ void ZipEntry::CentralDirEntry::dump(void) const
         ALOGD("  comment: '%s'\n", mFileComment);
 }
 
-} // namespace android
-