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

* commit '7e9e2fe70acd2841dc456c82c166791ff65c09b8':