Merge "Loads gps_debug.conf from vendor path before system path" into udc-dev