Merge "adb: don't append a slash to a path that already ends with one."