Fixed problems with buld bad for support of New Theme Engine from CyanogenMod