Fix Yahoo placefinder api call.

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

Change-Id: I71bae6236f0ae458c40567f681b0783e86030ff0
Automatic translation import

Change-Id: I2fe03d3cf7c74ef71d7e16cf4cf3a050d262e5f1
Automatic translation import

Change-Id: Id351b2b387329700c6353f41b75a373f61161ce6
Automatic translation import

Change-Id: Id52a761161033537068df359ae7c11563a195d25
Automatic translation import

Change-Id: I73ef8ad51cd2bf7614b5722d70d3635568f9bcd8
Automatic translation import

Change-Id: Ia6bdf7d0aa539a5c8043a6b50963114e8e1a184e
Automatic translation import

Change-Id: I1a4e8a80e73ce12bc4f9088fc02bec4d25c0b007
Merge remote-tracking branch 'cm/cm-11.0' into cm11mod