Merge "Remove changing uids/timestamps from zip/jar files"
am: a0975edc16

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