Switch back to CM device_common
Initial ion branch changes
Revert "switch back to Cyanogenmod qcom_gps"

This reverts commit 17d426d8f3d20c32591c39a8681103003802ca78.