Merge "Fix usage message." am: fb8c8651 am: 9d9e540c am: 8b1c4238 am:...

Merge "Fix usage message." am: fb8c8651 am: 9d9e540c am: 8b1c4238 am: 26fb87e0 am: dc728414

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



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