Fix a bunch more lint.

(If you ignore the compilers, we've got relatively little lint now. Fits on
a single screen.)

Change-Id: I51389002894d4fd8cf46f79d2bac57079322a030
diff --git a/src/zip_archive.h b/src/zip_archive.h
index cda3522..d7a8d80 100644
--- a/src/zip_archive.h
+++ b/src/zip_archive.h
@@ -42,7 +42,6 @@
   uint32_t GetCrc32();
 
  private:
-
   ZipEntry(const ZipArchive* zip_archive, const byte* ptr) : zip_archive_(zip_archive), ptr_(ptr) {}
 
   // Zip compression methods
@@ -65,11 +64,11 @@
   const byte* ptr_;
 
   friend class ZipArchive;
+  DISALLOW_COPY_AND_ASSIGN(ZipEntry);
 };
 
 class ZipArchive {
  public:
-
   // Zip file constants.
   static const uint32_t kEOCDSignature  = 0x06054b50;
   static const int32_t kEOCDLen         = 22;
@@ -122,6 +121,8 @@
   DirEntries dir_entries_;
 
   friend class ZipEntry;
+
+  DISALLOW_COPY_AND_ASSIGN(ZipArchive);
 };
 
 }  // namespace art