Fix skip test handling.

Bug: 141464494

Test: New unit tests pass.
Change-Id: I28898b5ff109219688a353d634e4bea0826550a1
2 files changed