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

Change-Id: Icd2b2aa74583439a282fb603a1757a29b71644c0