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

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

Change-Id: I9b41669671ba38b6f57d667c930c651be41b8eaf