Merge "Use arc4random when available to select delta for image relocation."
am: 039404cb8d

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