Merge "Various changes on GPS.h HAL definitions"