Merge "Scan for methods in extra interface hierarchy"
am: ce33604360

Change-Id: I799c7ec9704e1511eb2b44e10e390b796b936294