Revert^2 "Convert filegroup to library"

5fca5ff385d86ccd1a642ae2ae57d00a2e45acdb

Change-Id: I1a020fffc6345a131453b27d6f8bc2cf0acb942b
2 files changed