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

* commit '67e08950a972830d1c121ee5ab1d7fce02f975cb':