Merge "Libcore: Remove <> in CloseGuardMonitor test class"