Merge "Modify shader includes to match with vendor code" into udc-d1-dev