Sub-divide one of the big SKIP lines into more-fine-grain SKIP and FAIL lines, based on current top-of-tree status.

Bug: angleproject:3190
Change-Id: I50ac559a5b44c06b8e525d10efe3ff1b24350d6d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1676406Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Ian Elliott <ianelliott@google.com>