Revert^2 "Convert filegroup to library" am: 4e8ccccb am: 84ed6576 am:...

Revert^2 "Convert filegroup to library" am: 4e8ccccb am: 84ed6576 am: 476557fd am: d14ac417 am: 2fc4ae33

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>