Merge "Revert "Mark 2 libcore tests as failing.""