Merge change I5856aaca

* changes:
  Forgot to remove now-obsolete PDK files in last commit.