am 8f31aa80: am 3a07c04d: Merge "Fix test 304-method-tracing failure for Mips."

* commit '8f31aa80ff931e374877a2bbf2e3fbfaf848f2a0':
  Fix test 304-method-tracing failure for Mips.