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

* commit '05c67f03fe14cbc8cff58353fd35984b84225df5':
  Fix stub_test for Mips64