Merge "Fix dependencies through symlinks"
am: d66b2fd3cf

Change-Id: If67c87530e33ce6a939bf7280d0957c4be5d6595