Merge "Fix failure in --no-dex2oat invocation of 425-invokesuper."