Merge "Remove `return` after `GTEST_SKIP`." am: b274746dd3

Change-Id: I3565a970f6d8accbb446ca52ef31eafe7c931129