Merge "Fix gcc+arm builds"