Use image oat file instead of image header for immune spaces
am: df0a8275ab

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