Revert^2 "Convert filegroup to library" am: 4e8ccccbec am: 84ed6576e9 am: 476557fd43 am: d14ac41736 am: 2fc4ae33ff

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

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