Merge "Fix overridden method check in apicheck."