Merge "lpdump: When using -h, print usage to stdout so lpdumpd prints it."
am: 2e61a7758c

Change-Id: I9698754f5f0379db8310fb7d2ad2fca6d07e83b7