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

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}

[justincohen, 2016-08-12 21:33:40]

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

[justincohen, 2016-08-12 21:33:53]

Description was changed from

==========
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=
==========

to

==========
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=
NOTTRY=true
==========

[justincohen, 2016-08-12 21:33:57]

The CQ bit was checked by justincohen@chromium.org

[commit-bot: I haz the power, 2016-08-12 21:34:18]

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

[rohitrao (ping after 24h), 2016-08-12 21:36:48]

LGTM

[justincohen, 2016-08-12 21:37:12]

Description was changed from

==========
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=
NOTTRY=true
==========

to

==========
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
==========

[justincohen, 2016-08-12 21:37:36]

The CQ bit was unchecked by justincohen@chromium.org

[justincohen, 2016-08-12 21:37:43]

The CQ bit was checked by justincohen@chromium.org

[commit-bot: I haz the power, 2016-08-12 21:38:17]

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-12 21:43:00]

Description was changed from

==========
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
==========

to

==========
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
==========

[commit-bot: I haz the power, 2016-08-12 21:43:01]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-08-12 21:45:00]

Description was changed from

==========
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
==========

to

==========
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}
==========

[commit-bot: I haz the power, 2016-08-12 21:45:01]

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

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

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/2237313005/ by justincohen@chromium.org.

The reason for reverting is: 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/.