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