Merge "Install symlinks when using shortcut phony targets"
am: 6f1cf129f2

Change-Id: I73386358b3b74ed71f0e3640eb06b74eb923fb5a