java method usage search: use effective scope
(cherry picked from commit ae03dd9)
Fix compile
Merge remote-tracking branch 'origin/139' into 139