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

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



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