These changes we'll have to upstream at a later time.

BUG=angle:773

Change-Id: I18feb84ae58cb16e3e555c9ab65b6925ba35048e
Reviewed-on: https://chromium-review.googlesource.com/238443Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>