Merge "Clean up after "Load boot image at a random address.""
am: 8d72551de4

Change-Id: I57db19c88e6d2168c8c6e3e3887de5b353486277