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

Change-Id: Ic6fc50b31ea3e80fceb52382396b58fe97b3dace