Merge "Revert "Use arc4random when available to select delta for image relocation.""
am: beb709a260

* commit 'beb709a2607a00b5df33f0235f22ccdd876cee22':
  Revert "Use arc4random when available to select delta for image relocation."