Merge "Revert "Remove changing uids/timestamps from zip/jar files""