Merge "Fix compilation error when ENABLE_PIE=1" into integration