If /a/common is a symlink, don't replace it with an empty directory

It's a symlink on (at least) terbium. Follows Iaf19f0e8c.

Change-Id: I299118aaf2f900e624bc65552580003e9beca110
Merge "If /a/common is a symlink, don't replace it with an empty directory" into production