Merge "Only visit pointer arrays once during image relocation"
am: aaf56c4c95

* commit 'aaf56c4c95331d4dd8ac298e6c234d4d58d28308':
  Only visit pointer arrays once during image relocation