Merge "Load boot image at a random address."
am: 334c154f9b

Change-Id: Ida36df9a34878f45378b81ac1f1a00544da18c37