Merge "Fix oatdump .data.bimg.rel.ro for intrinsics."
am: c0584d9713

Change-Id: Ib78eeec98fe7fe064ae95f394afe6a0e686fad9b