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

* commit '3a07c04d2e6feec188994f73a3e6f48c6c4c49d6':
  Fix test 304-method-tracing failure for Mips.