Merge "linker: Fix the computation of si->base"