NickiToUpstream: BBS 1.16
NickiToUpstream: XPrivacy 2.1.20
NickiToUpstream: XPrivacy 2.1.21
Cleanup
NickiToUpstream: Remove CMHome as well

Conflicts:
	META-INF/com/google/android/updater-script
cm-11-20140710-NIGHTLY-mako
misc