Merge "Fix dependencies through symlinks" am: d66b2fd3cf am: eb5078f0a6

Change-Id: I292c31cc9409f4ae765fd74cb81b796a9091e871