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

* commit '52d9c2f0c584877e9c7f9e859d8068b3a2ccb12f':
  Use image oat file instead of image header for immune spaces