Linaro compatibility fix after latest CM11 source sync