Merge "Disable libcore tests for now." am: 2d33ce2d96
am: 767e4bdb78

Change-Id: I859824a6568f753d6149e9a47050efd904a08a1d