Second attempt to deflake package waterfall builders

R=sgjesse@google.com

Review URL: https://codereview.chromium.org//818673002