Merge "Carbon - Add all the possible ringtones available [2/2]" into kk
Conflicts:
	config/common.mk