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

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