Merge "Fix duplicate gps.conf for Shamu/Hammerhead"
am: a3d4e93d67

* commit 'a3d4e93d67143d7f8740ec5241c2ec6aabdbae68':
  Fix duplicate gps.conf for Shamu/Hammerhead