am 218eaf52: am 1ad55ef9: am f23c8e3b: Merge "Propertly quote arguments after latest adb/vogar changes."

* commit '218eaf528b4ff74681d7069f7846988ef6b227cd':
  Propertly quote arguments after latest adb/vogar changes.