added CM compatability
Merge branch 'master' of https://github.com/THEindian/android_device_glacier

Merge CM tree with CFX