Merge "Ready more build rules for dir move" into udc-dev