Merge "Ignore classes on the classpath when generating stubs"
am: c817b66016

Change-Id: Ia9068a94de9f50cbd387f016da301dd4db0780b1