Better symlinking from CM

Change-Id: Ib651cafd37f6b0332dd1580cb87af5127b0fbaa2