Merge "Fix build" into nyc-dev

am: 3552418fcf

* commit '3552418fcf7b3ae3764f2030db51b9ca85b8839a':
  Fix build

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java

@@ -307,6 +307,11 @@ public class BridgePackageManager extends PackageManager {
         return new String[0];
     }
 
+    @Override
+    public String getServicesSystemSharedLibraryPackageName() {
+        return null;
+    }
+
     @Override
     public FeatureInfo[] getSystemAvailableFeatures() {
         return new FeatureInfo[0];