galaxys2-common: fix gps.h mismerge