Merge "Linker: Get rid of "shortcuts" in image linking functions"