Merge "refactor and merge gps build system" into udc-qpr-dev