Merge "Remove dangling -- after parsing arguments" into main am: c27a993249

Original change: https://android-review.googlesource.com/c/platform/build/+/3434640

Change-Id: I890a9ed688af72879fc7e1c065845bc667fa02e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>