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

Change-Id: Ie2eff370cd949a095bcfa1685a01c93624278b92