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

Change-Id: I412e2518ceb20cf11d0be6f3a32ac4bbd107b1a6