Alphabetize flags

Re-alphabetize the flags and add an extra comment at the bottom to
try to keep future changes from just adding them to the bottom.

Test: builds
Change-Id: Ie8c1e0ac482c621c908eaac6503f6889a45fdd7c
Merged-In: Ie8c1e0ac482c621c908eaac6503f6889a45fdd7c