Merge pull request #9 from pcarenza/jb-mr1

merge xt926 device changes
gps: use common gps.conf

Change-Id: I4b73965e86865760b16ec498588a11ba41684624
Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_device_motorola_xt926 into HEAD