Revert "REVERT THIS BEFORE UPDATE ion: Rename heap_mask when used in userspace"

This reverts commit 163ab5fbe9b2db46bb169fd8d883aa15eac3d3cb.

Change-Id: Iabb6617c0a1b0d0a3987bac251e770fb8a3cc5c2
g2: Squashed kernel update

-Fast-forward with sources from LG
-Allows usage of caf-8974 (formerly caf-new)
-Fixes media errors
-Fixes some touch errors
-Fixes vSync

Original Commit: http://review.cyanogenmod.org/#/c/74987

Change-Id: I67376862a2dc8094188955c8a35369c769f0f37d