Merge "Output more for "Unable to determine architecture"."
am: 74a96e4545

Change-Id: I57f79d78b2e253ef4c9c69cf6fe08561e681f3aa