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

* commit '3a08475e539828287d382cc4e95ccaf2f221a0e5':
  Use arc4random when available to select delta for image relocation.