allow embedded hyphens in OptionHelper#getValidCliArgs CLI parsing

Bug: 30683145

Change-Id: Ifccebc1ef122114f3dd4465b0a66b277cfb14154
(cherry picked from commit 52464517276a4c6942e4c78d1fb6d5811faaf401)
3 files changed