Merge "Use arc4random when available to select delta for image relocation." am: 7dd1260c56 am: e397b365c7
am: 08f92a859c

* commit '08f92a859c9ad295239b1f3c0f05bac4815191cd':
  Use arc4random when available to select delta for image relocation.