am 9d4e96c4: am d17bd22d: Merge "Fix MIPS64 boot"

* commit '9d4e96c48d88f7ed24f4862044d5d7e022453165':
  Fix MIPS64 boot