Update skip test handling.

This matches upstream output and syncs with the new gtest update.

Bug: 142953481

Test: Tests pass.
Change-Id: I3377727d3c15729f54933e3dfcee21724ae63429
4 files changed