am eef893a5: am 50fb2436: Merge "Handle potential <clinit>() correctly in LVN."

* commit 'eef893a5dc10eb0514ed24fe7c196a31a49baccb':