Merge "Don't analyze methods with verification errors." am: 129ebeef13 am: 111347f255
am: 4af53b6d96

Change-Id: If8aac5c1eb91ce997cfec385e3118008998c4a28