manually patch location provider fix from this gerrit patch:

http://review.cyanogenmod.org/#/c/29349/

Change-Id: I3057018148020fac311d74e2099280eb63797257