Merge "Fix oatdump_image_test."
am: 48c98b745b

Change-Id: I8ac86addbe8c0ac710f75189dbfb03243c4c4cce