Merge "Use SS/GSS collectors in dex2oat if they are the default."
am: 390f5b377a

* commit '390f5b377af63bc22f0925cc0da9f67ae1eecec2':
  Use SS/GSS collectors in dex2oat if they are the default.