Merge "repo-review: Trim trailing slashes to avoid errors" am: 8ce5136cb5 am: 277c298174

Original change: https://android-review.googlesource.com/c/platform/development/+/1771795

Change-Id: I713ca4a1c8ce80b68a4701def3642afac75c5d50