Merge "Use image oat file instead of image header for immune spaces"