Restored ZenX to 2.1 version Point! + fix of config defines.
Now it's Mach and not stuck if switching from GOV to GOV.

full merge from here:
https://github.com/AndroidDeveloperAlliance/ZenKernel_TUNA/commit/bc045a7dd6b1e8671ea026c5071b08332cf53758