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

Change-Id: Ibbbbfecb27e7a5b7788bc55b3e0fd92b1a92980f