Merge "Use filegroup name not contents in $(location ...)"
am: 32bfd77b79

Change-Id: Ic1a95670878d47b6a1879f96cac8a17f70177e65