"Use new, 3.4 DS device repo (from HTC sensation)" Again

This reverts commit 0104d9ca8a46d95e6ea3eba6f3f8fa8aa6a3c772.
manifest.xml: /vendor/htc -> /vendor/htc-extra