Merge "zipalign missing header" am: 94180579f7 am: 2421b1c099

am: 390b7a953e

Change-Id: If5da2d15b5dfb07cd44469d1a1c2e226a26dfb0d

tools/zipalign/ZipAlign.cpp

@@ -19,8 +19,9 @@
  */
 #include "ZipFile.h"
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 using namespace android;
 

tools/zipalign/ZipEntry.cpp

@@ -23,10 +23,11 @@
 #include "ZipEntry.h"
 #include <utils/Log.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
 
 using namespace android;