Fix compilation in CyanogenMod source tree
Merge pull request #2 from jcromero/fix-cm-compilation

Fix compilation in CyanogenMod source tree