Merge "Use arc4random when available to select delta for image relocation." am: 7dd1260c56
am: e397b365c7

* commit 'e397b365c7c8361edfdd0da6dba6a29a97f1825f':
  Use arc4random when available to select delta for image relocation.