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

* commit 'f77eb12f02d233cc34e7c0d2c14c0ad737c1d8bb':
  Switch mips64 back to NDK r10.

Change-Id: Ia93c84ce3272dfb6cc83e65e1be9e3148bfa161d