fix empty folders

Change-Id: I588f3b0a9d8b186fb1489f637a2b6e44b8da858e