Merge "Fixing the PDK build. A file PDK slurps in was moved."