Merge "Fixing apicheck to cope with interfaces inherited from other interfaces."