am e2aa073e: Merge "Small fixes to get the boot image compiled in debug mode."

* commit 'e2aa073e57e8129706cf4f87c1e7c5cfedd2951f':
  Small fixes to get the boot image compiled in debug mode.