track forked version.
Nope.
Track HALO

Change-Id: I6bde18d897c5eb638fcba95cc665093b44f6da6e
Fix evita repo name

Now that the DMCA stuff isn't an issue, evita is now named properly again.
Track our own opt_tel - fixes i777, i9100, n7000 telephony.
Track our MediaProvider
Merge remote-tracking branch 'upstream/jb2' into jb2

Conflicts:
	default.xml