Merge cherrypicks of [8059009, 8059026, 8059343, 8059224, 8059028, 8058794, 8059011] into qt-aml-release

Change-Id: Id0b2d330d51a4458c738cf7d939f5476958c2a2e
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",