am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy"

* commit '4eec22a6627927aaa11a67e3e18d36534af81856':
  Use a less freqent dummy file name: zipdummy