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

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

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