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

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