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

Change-Id: I100df67136389398009c0ba043083bdde9028a2e