Merge "Do not consider clinit as static interface method"