Cherry-pick Skia infra fixes to m53

Cherry-pick Skia infra fixes to m53 so that Windows and Android bots can run tests.

BUG=chromium:629281
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2157213002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Author: borenet <borenet@chromium.org>;
Date:   Thu Jun 30 05:20:03 2016 -0700

    Add Android SDK asset
    
    This will allow us to use CIPD to install the Android SDK on bots.
    
    BUG=skia:5427
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2086003002
    
    Review-Url: https://codereview.chromium.org/2086003002

Author: skia.buildbots <skia.buildbots@gmail.com>;
Date:   Fri Jul 1 17:29:18 2016 -0700

    Update Win toolchain
    
    BUG=chromium:629281
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2116173002
    NOTREECHECKS=true
    NOTRY=true
    TBR=rmistry@google.com
    
    Review-Url: https://codereview.chromium.org/2116173002

[dogben, 2016-07-18 22:05:55]

Description was changed from

==========
Update Win toolchain

BUG=chromium:629281
==========

to

==========
Update Win toolchain

BUG=chromium:629281
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2157213002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

[dogben, 2016-07-18 22:06:44]

benjaminwagner@google.com changed reviewers:
+ borenet@google.com

[dogben, 2016-07-18 22:10:27]

Description was changed from

==========
Update Win toolchain

BUG=chromium:629281
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2157213002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Cherry-pick Skia infra fixes to m53 so that Windows and Android bots can run
tests.

BUG=chromium:629281
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2157213002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Author: borenet <borenet@chromium.org>
Date:   Thu Jun 30 05:20:03 2016 -0700

    Add Android SDK asset
    
    This will allow us to use CIPD to install the Android SDK on bots.
    
    BUG=skia:5427
    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2086003002
    
    Review-Url: https://codereview.chromium.org/2086003002

Author: skia.buildbots <skia.buildbots@gmail.com>
Date:   Fri Jul 1 17:29:18 2016 -0700

    Update Win toolchain
    
    BUG=chromium:629281
    GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2116173002
    NOTREECHECKS=true
    NOTRY=true
    TBR=rmistry@google.com
    
    Review-Url: https://codereview.chromium.org/2116173002
==========

[borenet, 2016-07-19 11:06:49]

You're missing the win toolchain change:
https://skia.googlesource.com/skia/+/f1120ea72cd04c686a11d557d3cc3d4ac47fd350

[dogben, 2016-07-19 13:02:30]

On 2016/07/19 at 11:06:49, borenet wrote:
> You're missing the win toolchain change:
https://skia.googlesource.com/skia/+/f1120ea72cd04c686a11d557d3cc3d4ac47fd350

Starting over.