Reland of Work around simctl error when moving from Xcode 7 to Xcode 8.

Reland of Work around simctl error when moving from Xcode 7 to Xcode 8. (patchset #1 id:1 of https://codereview.chromium.org/2239233004/ )

Reason for revert:
Turns out the correct fix is here, and this wasn't causing the issue.  Putting back this code since it still has some value if a swarming bot is testing Xcode 7 code.

Other fix here: https://codereview.chromium.org/2240373002/

Original issue's description:
> Revert of Work around simctl error when moving from Xcode 7 to Xcode 8. (patchset #1 id:1 of https://codereview.chromium.org/2226963003/ )
>
> Reason for revert:
> This is causing a timeout where we no longer run Xcode 7.  Try removing it.
>
> Original issue's description:
> > Work around simctl error when moving from Xcode 7 to Xcode 8.
> >
> > BUG=
> > TBR=rohitrao@chromium.org
> >
> > Committed: https://crrev.com/83610f5d8af84ad969d47824120324cec2bcf8e2
> > Cr-Commit-Position: refs/heads/master@{#410636}
>
> TBR=stkhapugin@chromium.org,rohitrao@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=
> NOTRY=true
>
> Committed: https://crrev.com/eaca3e2d0a45942d4ad0c24ee20cd180d4820fd1
> Cr-Commit-Position: refs/heads/master@{#411784}

TBR=stkhapugin@chromium.org,rohitrao@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Committed: https://crrev.com/e515e31dcd819a489e49cec1066994350aea3e17
Cr-Commit-Position: refs/heads/master@{#411852}

[justincohen, 2016-08-13 01:58:10]

The CQ bit was checked by justincohen@chromium.org

[justincohen, 2016-08-13 01:58:10]

Created Reland of Work around simctl error when moving from Xcode 7 to Xcode 8.

[commit-bot: I haz the power, 2016-08-13 01:58:29]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-13 01:59:34]

Description was changed from

==========
Reland of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2239233004/ )

Reason for revert:
Turns out the correct fix is here, and this wasn't causing the issue.  Putting
back this code since it still has some value if a swarming bot is testing Xcode
7 code.

Other fix here: https://codereview.chromium.org/2240373002/

Original issue's description:
> Revert of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2226963003/ )
> 
> Reason for revert:
> This is causing a timeout where we no longer run Xcode 7.  Try removing it.
> 
> Original issue's description:
> > Work around simctl error when moving from Xcode 7 to Xcode 8.
> >
> > BUG=
> > TBR=rohitrao@chromium.org
> >
> > Committed: https://crrev.com/83610f5d8af84ad969d47824120324cec2bcf8e2
> > Cr-Commit-Position: refs/heads/master@{#410636}
> 
> TBR=stkhapugin@chromium.org,rohitrao@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=
> NOTRY=true
> 
> Committed: https://crrev.com/eaca3e2d0a45942d4ad0c24ee20cd180d4820fd1
> Cr-Commit-Position: refs/heads/master@{#411784}

TBR=stkhapugin@chromium.org,rohitrao@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
==========

to

==========
Reland of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2239233004/ )

Reason for revert:
Turns out the correct fix is here, and this wasn't causing the issue.  Putting
back this code since it still has some value if a swarming bot is testing Xcode
7 code.

Other fix here: https://codereview.chromium.org/2240373002/

Original issue's description:
> Revert of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2226963003/ )
> 
> Reason for revert:
> This is causing a timeout where we no longer run Xcode 7.  Try removing it.
> 
> Original issue's description:
> > Work around simctl error when moving from Xcode 7 to Xcode 8.
> >
> > BUG=
> > TBR=rohitrao@chromium.org
> >
> > Committed: https://crrev.com/83610f5d8af84ad969d47824120324cec2bcf8e2
> > Cr-Commit-Position: refs/heads/master@{#410636}
> 
> TBR=stkhapugin@chromium.org,rohitrao@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=
> NOTRY=true
> 
> Committed: https://crrev.com/eaca3e2d0a45942d4ad0c24ee20cd180d4820fd1
> Cr-Commit-Position: refs/heads/master@{#411784}

TBR=stkhapugin@chromium.org,rohitrao@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
==========

[commit-bot: I haz the power, 2016-08-13 01:59:35]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-08-13 02:03:30]

Description was changed from

==========
Reland of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2239233004/ )

Reason for revert:
Turns out the correct fix is here, and this wasn't causing the issue.  Putting
back this code since it still has some value if a swarming bot is testing Xcode
7 code.

Other fix here: https://codereview.chromium.org/2240373002/

Original issue's description:
> Revert of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2226963003/ )
> 
> Reason for revert:
> This is causing a timeout where we no longer run Xcode 7.  Try removing it.
> 
> Original issue's description:
> > Work around simctl error when moving from Xcode 7 to Xcode 8.
> >
> > BUG=
> > TBR=rohitrao@chromium.org
> >
> > Committed: https://crrev.com/83610f5d8af84ad969d47824120324cec2bcf8e2
> > Cr-Commit-Position: refs/heads/master@{#410636}
> 
> TBR=stkhapugin@chromium.org,rohitrao@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=
> NOTRY=true
> 
> Committed: https://crrev.com/eaca3e2d0a45942d4ad0c24ee20cd180d4820fd1
> Cr-Commit-Position: refs/heads/master@{#411784}

TBR=stkhapugin@chromium.org,rohitrao@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
==========

to

==========
Reland of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2239233004/ )

Reason for revert:
Turns out the correct fix is here, and this wasn't causing the issue.  Putting
back this code since it still has some value if a swarming bot is testing Xcode
7 code.

Other fix here: https://codereview.chromium.org/2240373002/

Original issue's description:
> Revert of Work around simctl error when moving from Xcode 7 to Xcode 8.
(patchset #1 id:1 of https://codereview.chromium.org/2226963003/ )
>
> Reason for revert:
> This is causing a timeout where we no longer run Xcode 7.  Try removing it.
>
> Original issue's description:
> > Work around simctl error when moving from Xcode 7 to Xcode 8.
> >
> > BUG=
> > TBR=rohitrao@chromium.org
> >
> > Committed: https://crrev.com/83610f5d8af84ad969d47824120324cec2bcf8e2
> > Cr-Commit-Position: refs/heads/master@{#410636}
>
> TBR=stkhapugin@chromium.org,rohitrao@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=
> NOTRY=true
>
> Committed: https://crrev.com/eaca3e2d0a45942d4ad0c24ee20cd180d4820fd1
> Cr-Commit-Position: refs/heads/master@{#411784}

TBR=stkhapugin@chromium.org,rohitrao@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Committed: https://crrev.com/e515e31dcd819a489e49cec1066994350aea3e17
Cr-Commit-Position: refs/heads/master@{#411852}
==========

[commit-bot: I haz the power, 2016-08-13 02:03:31]

Patchset 1 (id:??) landed as
https://crrev.com/e515e31dcd819a489e49cec1066994350aea3e17
Cr-Commit-Position: refs/heads/master@{#411852}