Always exclude -h from short args

Change-Id: Ibb63dd83701272ab84cc7f847e2b38337b281dea
Merge "Always exclude -h from short args"