Merge "tool --help alphabetizes command line flags" into master-skia

https://skia.googlesource.com/skia/+/03758b8c4a7f22c74a107905d8e16effab1c0442

Change-Id: I2bfaaf6ef22639738d052aebd66d60f6e529a29c