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

Change-Id: Iffb8150e70c668850be28b467f1d7cd6917ebc26