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

Change-Id: I3be2322f518d99993b9b694a011267df5b1bf626