Add ION multimedia heaps

Conflicts:
	arch/arm/mach-msm/board-ruby.c