[test_gps] Remove git merge artifacts that broke compilation

While merging some errors were introduced making test_gps not compile
anymore. This patches fixes it.

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>