Merge "Try to reenable some libcore tests with CC."