am 82ae08ae: am 2684c1a5: Merge "Libcore: Remove <> in CloseGuardMonitor test class"

* commit '82ae08aec4c150b8cb2d909b2067e080556774c5':
  Libcore: Remove <> in CloseGuardMonitor test class