Merge "Revert "Mark 2 libcore tests as failing."" am: 8a5c253769
am: d309ccad6c

* commit 'd309ccad6cda6f3c2183a0f735ea48fbd06eff9c':
  Revert "Mark 2 libcore tests as failing."