Cleanup empty directories

PR:	conf/167133