holiday: ION: rebase and cleanup.

* Rebased heaps on pyramid
* added ION Firmware heap
* Also cleaned up spacing and ifdefs for easier future merges

Change-Id: I149472dfc9278c77aa656f832da8dd8a87ec203a

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