am 61fdb24e: (-s ours) am 173411f7: Temporarily omit libcore tests that fail when run in CTS harness. DO NOT MERGE.

Merge commit '61fdb24e732f0effb72c70491845a497e99faae1'

* commit '61fdb24e732f0effb72c70491845a497e99faae1':
  Temporarily omit libcore tests that fail when run in CTS harness. DO NOT MERGE.