Merge "build : Fix cross-compilation errors"