Merge "Revert "Use arc4random when available to select delta for image relocation."" am: beb709a260 am: 6212c0f0a5
am: 69c7f2f758

* commit '69c7f2f7587349521a2094eaf2ed5f0048b563d5':