Merge "Revert "Convert filegroup to library"" am: 0801f8008b am: 53d695ed20

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110247

Change-Id: I2cfff0eccca0a9e3860297b32c1a54c2f83f7340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>