Merge "Revert "Load boot image at a random address.""
am: 233b572a94

Change-Id: I7632facb8fd48ec01250a42218b3553ebc5f1676