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