am f23c8e3b: Merge "Propertly quote arguments after latest adb/vogar changes."

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