Merge "Use filegroup name not contents in $(location ...)"