Merge "Fix ReadBarrier misuse when relocating the image." am: c69e8d68ef
am: 804ca04d31

Change-Id: I886ba7b1ae04025dc969e2d5dc0eed444ec22fe3