Move from tobin_remove_wdk_dependence back to master.

Bug: 1022751
Change-Id: I3ac11fd6297cd8db935877cd934c66744d61956e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1928614Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>