Merge "Use the new more inclusive command-line options." am: 661ba03b am:...

Merge "Use the new more inclusive command-line options." am: 661ba03b am: 86ab07a8 am: 4fa6475f am: 6fb4058b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1679789

Change-Id: Ia40cb65fcc2aff0c442809e17eb89f397da442c4