BUG=angleproject:1204
TEST=bootstrap and build in Linux and Windows 8

Change-Id: Iad43ed41588d4519e3881dc48771beae375b5d40
Reviewed-on: https://chromium-review.googlesource.com/313793Tested-by: Frank Henigman <fjhenigman@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>