Merge "Add a build-time flag for LLPVM Changes in AVF" into main