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

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

Change-Id: I69e4c24da9efc9c05949f1b0f8e8b89c6c8d171c