Merge "ART: Fix oatdump check" am: 20d35be37a
am: 4f9353a878

Change-Id: Ic84eb79160bf51d7cadd0d466cbc6a9b9884aa1f