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

Change-Id: I8a6c1791532318a96844cc49c708a99b7283bb8c