Merge "Clean up OatFileAssistant getting of image info."
am: b7b043a6ee

Change-Id: I44deac4ba38948720620cee348f571165655382b