am bcd1e1c8: am 570a0eef: Dist userdataimg and tests-zip-package for tests builds

Merge commit 'bcd1e1c8580213838b8ba415168065291019dcd4'

* commit 'bcd1e1c8580213838b8ba415168065291019dcd4':
  Dist userdataimg and tests-zip-package for tests builds