Merge "Use image oat file instead of image header for immune spaces" am: 52d9c2f0c5
am: 2144f894eb

* commit '2144f894eb1c274208a94c163707439f538a79cc':
  Use image oat file instead of image header for immune spaces