am ee6916c0: am 1adc7c03: Merge "linker: Fix the computation of si->base"

* commit 'ee6916c00718185df3930a18050e5b47685ef524':
  linker: Fix the computation of si->base