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

Change-Id: Id9932a219d9dbfdbd839d325ca02fd391834024a