Merge changes I1bf07301,I48e8ebf3

* changes:
  Remove more duplicated symlinks
  Remove duplicated debugfs symlink