Merge "Add gps_debug.conf module"
am: 20e6f31923

Change-Id: I52bd7db400eb115474736c1b0c735739822192f1