am ca5c576d: Merge "Fix LIBCORE_SKIP_TESTS without causing warnings."

* commit 'ca5c576d5863496bf81eb8916ea5c03f5b12fd90':
  Fix LIBCORE_SKIP_TESTS without causing warnings.