am 9043202b: am 20958207: Merge "Fix MIPS linker build"

* commit '9043202b5bb8e0725b0302e9da9d3a57c837e798':
  Fix MIPS linker build