Fix Yahoo placefinder api call.

Some location query returns both empty city and neighborhood, use county instead.

Change-Id: I71bae6236f0ae458c40567f681b0783e86030ff0
Merge branch 'cm-11.0' into kk_mkt