Merge "Hero: Allow include small_hero.mk instead of full_hero.mk by defining CYANOGEN_SMALL symbol." into gingerbread