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

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

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



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