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

* commit '2527a8b5a652d7f88b662fe3788e29b6bc2bbe78':
  Fix MIPS linker build