Merge "Revert "Remove changing uids/timestamps from zip/jar files"" am: 49d8c5196e
am: d8d06da814

* commit 'd8d06da814fa02413bc3e58f3047f9a2ab61bb09':
  Revert "Remove changing uids/timestamps from zip/jar files"