Merge "Stop ignoring classes on the classpath for stubs"