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

Change-Id: Iae5798157a855f3a7b3e699ccc2cb0b52d80641e