Merge "Fix verifier crash on abstract final class." am: d68677c5fd
am: 4d32c69622

Change-Id: Ia92526ea0cbeee6738cf07b5c620ffa7007214af