Merge "Output more for "Unable to determine architecture"." am: 74a96e45 am: cfeefce1 am: 0e20221c am: 6e1758ab Change-Id: I0cd8d6c203d2a54dc0140b85b7a6ec095ed49320