Add extra output for imgdiag's failing CHECK. am: 20af92fd0b
am: 8af811edee

Change-Id: Id223f4d1d99b87301f07ea86a36e2f3a964db131