Merge "Remove changing uids/timestamps from zip/jar files" am: 9f25219371
am: a51b1d532e

* commit 'a51b1d532e998c1668fd991f53c6619e02d9338a':
  Remove changing uids/timestamps from zip/jar files