Okay, I applied the changes as shared in the commit and the compilation seems to be progressing ahead for now.
Thanks,
Shrenik