Merge "gps: Update gps makefile" into 24D1-dev