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

Change-Id: I596ddee726c26df77da1b71f8e87d8ac11ee8fe2