Revert "Add support for BeiDou and Glonass"

This reverts commit 9c3c49b082916f83f4ced99ae81647e5c3fc1202
since it picked up the wrong patch for merge
CRs-fixed: 582614

Change-Id: I6e1d45856fa26d470209396980f46ea13e5041db