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

* commit '23fe448699796c32fed8f7cef8919e06d0bcaeed':
  Use arc4random when available to select delta for image relocation.