Merge cherrypicks of [8059010, 8059027, 8059344, 8059225, 8059029, 8058795, 8059012] into qt-release

Change-Id: I53a9ac8e9fed7849a90edb11ef3f6a9d393b7968
diff --git a/updater/Android.bp b/updater/Android.bp
index 4e87db2..b80cdb3 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -45,8 +45,6 @@
         "libcrypto",
         "libcrypto_utils",
         "libcutils",
-        "libcgrouprc",
-        "libcgrouprc_format",
         "libutils",
         "libtune2fs",