remove google specific location features

Change-Id: I5e00895e028013e232920b30023dec3ae410b22d
mark device as wifi-only

Change-Id: I69056dd172dbe23fa5c9abed3d4be1f6a24452f0
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD