Merge "Revert "Temporarily disable failing libcore tests (caused by mockito merge).""
am: 8402166d0e

Change-Id: Ia84ff7ff6fa5a4ef25cec1ded2a67b25e737b1ec