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

* commit '44e6d985fddb3d921f054ff64c319c86005118e9':
  Fix failure in --no-dex2oat invocation of 425-invokesuper.