am 11f663fc: am 05c67f03: am e20df2a6: Merge "Fix stub_test for Mips64"

* commit '11f663fc3c7737cb99399b2de2ea219de9b22034':
  Fix stub_test for Mips64