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

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

Change-Id: I0804a6e12b590f18a9b3253253ea1d6f19c1e65b