Revert "Glacier: move specific kernel defines to common"

This reverts commit 51e3ca9e1655767d596afc8771b53ac2dcfe82b0

Change-Id: I3f7c57b869d152abd3c1fceaedb35bc5f107aa75