Merge "Temporarily disable failing libcore tests (caused by mockito merge)." am: 405099d76b
am: 5b8bcfaaf8

Change-Id: Ifdbec1bd385a4d49b229b1f9b961f11cf2193dfb