holiday: update ION memory heaps for new vidc changes.
shooter: mem remap
holiday: fixup ION_HEAP_NUM ifdef/

4 was actually not being set. I messed up the flow of the ifdef in my head.

Should be good now

Change-Id: Ida24553aa4c43b5621cbdaaa4d84eb633725647a
holiday: increase ION_MM heap size by 1Mb (credit: sultanxda)

Change-Id: I9504a3414241492e2dd2977ccdad77cfd0157077