Fix bug in scaladoc provider where class and object of same were not disambiguated between correctly.

RB=288605
R=mtagle,kparikh,si-dev,tworboys,kjin,gogenc
A=kparikh,tworboys