Merge "Revert^2 "Load boot image at a random address.""
am: 960a63e667

Change-Id: Idb2bcbf57c2e5df56294f16e6767b9c9be1d0fda