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

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

Change-Id: Id7313c744b537e515f13ed0d76c4fdfa23997df1