Merge "Convert new tests to GTEST_SKIP."
am: e7ee0731c3

Change-Id: Icb868f196313b5fa45f9e42c7c1a6533677c50f3