Merge "Remove special cases in installclean"
am: fc7c3d33b8

* commit 'fc7c3d33b8b32042f8c12687fd269270b4e8ec90':
  Remove special cases in installclean