am 84668136: Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev

* commit '8466813637cf2b1f5f12f8524237aed6c95ad4e9':
  delete obsolete duplicate files