Fix GPS building

Change-Id: I8c931a777e2efd3e8863eceb6fbc7a327fd2cf4d