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