Merge "Revert "Temporarily disable failing libcore tests (caused by mockito merge).""