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

Change-Id: I462637c2d9bf0720c788d9374479de0f2c6304bb