Merge "Use the new more inclusive command-line options." am: 661ba03bd6 am: 86ab07a8d2 am: 4fa6475f3a

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

Change-Id: I664977a0a593c5f02aaf3a51fe61aeffb5d75974