Merge "Revert "Convert filegroup to library"" am: 0801f800 am: 53d695ed...

Merge "Revert "Convert filegroup to library"" am: 0801f800 am: 53d695ed am: c2f6a875 am: 955068b7 am: ca83ab9b

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



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