Some tracking changes
Change RBPapers tracking
Track CM Media provider
Mako: Use franco kernel for builds
Add jfltexx support (GT-I9505)
Derp
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2

Conflicts:
	default.xml