Revert of skia: ANGLE deps roll

Revert of skia: ANGLE deps roll (patchset #1 id:1 of https://codereview.chromium.org/1244843003/)

Reason for revert:
Compile error that the try bots didn't catch :(

Original issue's description:
> ANGLE deps roll
> 
> If we ever want to allow the command buffer as a skia gles2 backend,
> we need a more up to date version of ANGLE, specifically there are
> 4 defines that differ between newer and older versions of ANGLE which
> we use in skia, I've updated these in this change.
> 
> I'm not quite sure if what I've done for the 'angle_path' is correct,
> I tried setting it to a path relative to skia, and to '<(DEPTH)', both
> of which do not compile correctly, only '../' worked.
> 
> Committed: https://skia.googlesource.com/skia/+/db0b1e796ddbd08e6be8a666537318b1c0e2ce56

TBR=bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://skia.googlesource.com/skia/+/cd94d7341f454ba7acb090f63ef99fdbf5bba415

[hendrikw, 2015-07-21 20:24:12]

Created Revert of skia: ANGLE deps roll

[commit-bot: I haz the power, 2015-07-21 20:24:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1245223007/1

[commit-bot: I haz the power, 2015-07-21 20:24:23]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-07-22 02:24 UTC

[bsalomon, 2015-07-21 21:04:44]

On 2015/07/21 20:24:23, commit-bot: I haz the power wrote:
> Note for Reviewers:
> The CQ is waiting for an approval.
> If you believe that the CL is not ready yet, or if you would like to L-G-T-M
> with comments then please uncheck the CQ checkbox.
> 
> Waiting for LGTM from valid reviewer(s) till 2015-07-22 02:24 UTC

lgtm

[commit-bot: I haz the power, 2015-07-21 21:06:13]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/cd94d7341f454ba7acb090f63ef99fdbf5bba415