Improve cleanup for empty platforms directories.
Merge branch 'refs/heads/master' into 2.2.x-legacy