Merge "Don't special case kRuntimeISA for getting image info." am: 35c3ace321 am: 3c6e88bc71
am: fcbe903fce

Change-Id: Ia173e63fad341a807362771de99557348ecaa8a4