am 20958207: Merge "Fix MIPS linker build"

* commit '20958207d5f9d36cc6f6b3edc4ff899c73b72b02':
  Fix MIPS linker build