Merge "Fix oatdump_test."
am: 9f08dfabb8

Change-Id: I852ab76267f5df249a18a8b0b6f3cbff1dbe4f08