[automerger skipped] Track more static dependencies for notice files
am: a113745d1f  -s ours

Change-Id: Iee9eb3385dc82a8643f099009b8f237b015f9eed