LockClock: remove play services lib define

Change-Id: Ib25ddbd1c895b0e54b330032b42f3433b00145c6
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge remote-tracking branch 'cm/cm-11.0' into cm11mod
Fix Yahoo placefinder api call.

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

Change-Id: I71bae6236f0ae458c40567f681b0783e86030ff0