Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread