am e20df2a6: Merge "Fix stub_test for Mips64"

* commit 'e20df2a6a48ca4e35289459354dc25247aad7406':
  Fix stub_test for Mips64