Merge "Use filegroup for notice files."
am: c78aa7e0a0

Change-Id: If4b4516b852be8cad78d1b4e6b1bf914f28ecaa1