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
	arch/arm/mach-msm/board-holiday.h
holiday: increase PMEM SMI size

With this change along with re-adding PMEM SMI to display HAL results in
camera being much more stable now. Can now take multiple recordings.

Change-Id: Iaecfb98aa0f3116177dfd647150918e07b9865ad

Conflicts:

	arch/arm/mach-msm/board-holiday.h
holiday: correct userspace memory allocation after PMEM SMI increase

Change-Id: I6657aab556e6959172fa57a657f27ce07734cd48

Conflicts:

	arch/arm/mach-msm/board-holiday.h
shooter: increase PMEM SMI size and adjust userspace accordingly.

Hopefully this yields the same results as on the holiday

Change-Id: If778a7ee1a627e43417cc4369a623f8b26611c1f
pyramid: ION: rebase off of sultan's updated heaps

Change-Id: I0fd1cbee95e45fb42fc38b13f2fcdfca128a958b

Conflicts:

	arch/arm/mach-msm/board-pyramid.c
	arch/arm/mach-msm/board-pyramid.h
pyramid: increase PMEM SMI size

Change-Id: Ie073c670d248a287f1cba245d52973770704a5b6

Conflicts:

	arch/arm/mach-msm/board-pyramid.h