Merge "Use the new more inclusive command-line options." am: 8e14fec0c8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1679309

Change-Id: Ia5e15f3eda74adba5e78a112aed6ac4db874a0f9