Merge "Switch mips64 back to NDK r10."
am: 9ecf544

* commit '9ecf54456c6fc0adc9bc635cfe59a8836eb95a10':
  Switch mips64 back to NDK r10.

Change-Id: I0aa5cfb46d446f9b12a9db6ac066ee100a4e9fb3