Merge "Revert "Link PlatformProperties statically""
diff --git a/Android.bp b/Android.bp
index 5590126..a81158d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,10 +30,9 @@
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
         "androidx.legacy_legacy-preference-v14",
+        "guava",
         "android-support-annotations",
         "com.android.phone.common-lib",
-        "guava",
-        "PlatformProperties",
     ],
 
     srcs: [