Some fix for Samsung build