Add HTC One Common Repos
Revert "Add infuse4g"

This reverts commit f01c04fd7c73bf29814ab3a4315d0f6cff7092eb.
Revert "Device and app needed for Infuse4g"

This reverts commit 66fd8d15df76636313f536176c83db591d69c0df.
Readd SamsungServiceMode Package Repo
Merge remote-tracking branch 'upstream/jb2' into jb2

Conflicts:
	default.xml