Merge "Use the new more inclusive command-line options." am: 8e14fec0 am: 0de07374 am: e86260a3 am: a7602f9d am: 38e57420

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

Change-Id: Ice1c9e082700cd5d50a133a54f6afaccf8ded068