Merge "xci: Fix the PDF/IDF env vars"