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

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