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

Change-Id: Ifa563e6b02a2892fd5b8b862a07176337947d848