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

* commit 'b7d1f69a7e4710b13308afc9018adb1ecd9e47c2':
  delete obsolete duplicate files