Merge branch 'upstream-master'

Initial downstream of jcommander code (tag jcommander-1.48)
from https://github.com/cbeust/jcommander

Bug: 27552463
Change-Id: Ia72763ed396d2f3ac3bc2bc66fb3e383818e1c82