diff --git a/METADATA b/METADATA
index 487c3e3..d65b0fb 100644
--- a/METADATA
+++ b/METADATA
@@ -1,11 +1,11 @@
 third_party {
-  # would be NOTICE save for EPL in:
-  #   create/tests/res/mock_data/mock_android/fake/InnerTest.java
-  #   create/tests/res/mock_data/mock_android/util/EmptyArray.java
-  #   create/tests/res/mock_data/mock_android/view/View.java
-  #   create/tests/res/mock_data/mock_android/view/ViewGroup.java
-  #   create/tests/res/mock_data/mock_android/widget/LinearLayout.java
-  #   create/tests/res/mock_data/mock_android/widget/TableLayout.java
-  #   create/tests/res/mock_data/notjava/lang/JavaClass.java
+  license_note: "would be NOTICE save for EPL in:\n"
+  "   create/tests/res/mock_data/mock_android/fake/InnerTest.java\n"
+  "   create/tests/res/mock_data/mock_android/util/EmptyArray.java\n"
+  "   create/tests/res/mock_data/mock_android/view/View.java\n"
+  "   create/tests/res/mock_data/mock_android/view/ViewGroup.java\n"
+  "   create/tests/res/mock_data/mock_android/widget/LinearLayout.java\n"
+  "   create/tests/res/mock_data/mock_android/widget/TableLayout.java\n"
+  "   create/tests/res/mock_data/notjava/lang/JavaClass.java"
   license_type: RECIPROCAL
 }
diff --git a/bridge/src/android/view/WindowManagerImpl.java b/bridge/src/android/view/WindowManagerImpl.java
index f3d5a87..dabeda3 100644
--- a/bridge/src/android/view/WindowManagerImpl.java
+++ b/bridge/src/android/view/WindowManagerImpl.java
@@ -120,18 +120,18 @@
                     int parentHeight = MeasureSpec.getSize(parentHeightMeasureSpec);
                     int childWidthMeasureSpec = 0;
                     int childHeightMeasureSpec = ViewRootImpl.getRootMeasureSpec(parentHeight,
-                            lp.height);
+                            lp.height, 0);
                     if (lp.width == WRAP_CONTENT) {
                         int baseSize =
                                 mContext.getResources().getDimensionPixelSize(R.dimen.config_prefDialogWidth);
                         if (baseSize != 0 && baseSize < parentWidth) {
                             childWidthMeasureSpec = ViewRootImpl.getRootMeasureSpec(baseSize,
-                                    lp.width);
+                                    lp.width, 0);
                         }
                     }
                     if (childWidthMeasureSpec == 0) {
                         childWidthMeasureSpec = ViewRootImpl.getRootMeasureSpec(parentWidth,
-                                lp.width);
+                                lp.width, 0);
                     }
                     child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
                 }
diff --git a/create/Android.bp b/create/Android.bp
index 2be2680..96622e9 100644
--- a/create/Android.bp
+++ b/create/Android.bp
@@ -25,8 +25,8 @@
 
     main_class: "com.android.tools.layoutlib.create.Main",
     static_libs: [
-        "asm-7.0",
-        "asm-commons-7.0",
+        "asm-9.2",
+        "asm-commons-9.2",
         "guava",
         "layoutlib-common",
         "layoutlib_create-classpath",
diff --git a/create/tests/Android.bp b/create/tests/Android.bp
index b64b484..b5e7033 100644
--- a/create/tests/Android.bp
+++ b/create/tests/Android.bp
@@ -39,7 +39,7 @@
         "junit",
         "hamcrest",
     ],
-    static_libs: ["asm-7.0"],
+    static_libs: ["asm-9.2"],
 
     // Copy the jar to DIST_DIR for sdk builds
     dist: {
diff --git a/delegates/Android.bp b/delegates/Android.bp
index a7fad80..93bcd6d 100644
--- a/delegates/Android.bp
+++ b/delegates/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library_host {
     name: "layoutlib-common-delegates",