Fix assert failures on CyanogenMod installation