Registering these options as global flags pollutes the global opt
namespace and is masking plugin-specific options in other plugins.
Partial-Bug: 1595616
This reverts commit 0b2b870237b6a332239dcad73cd9cab2634cb44f.
Change-Id: I7ef5c5511adc40d603374c4963ba22556f16252e