Merge "Do not consider clinit as static interface method"
am: 7af1e1070f

Change-Id: I9ca7a4cef1d4e3acc46087b34cb8c1451464d72e