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

Change-Id: If5364d5cd6dfba2b8fd23b2f63d651324a23a41d