am 685a0104: am 44e6d985: Merge "Fix failure in --no-dex2oat invocation of 425-invokesuper."

* commit '685a01048a4409432c56fd4ccd6a56c2f20cf978':
  Fix failure in --no-dex2oat invocation of 425-invokesuper.