Merge "Prompt dx/jack setting of command line in failure report."
am: 65e514a0ba

Change-Id: Ia0d4cf47abf0837152a04fa1b18f68a31defa2e5