diff --git a/envsetup.sh b/envsetup.sh
index 8b36bbab23..bbcd4f5aac 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -700,6 +700,7 @@ function mmm()
                 fi
             fi
         done
+        echo "ONE_SHOT_MAKEFILE=$MAKEFILE make -C $T $DASH_ARGS all_modules $ARGS"
         ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T $DASH_ARGS all_modules $ARGS
     else
         echo "Couldn't locate the top of the tree.  Try setting TOP."
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 92de1b2963..7e470b9eea 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -121,7 +121,8 @@ PRODUCT_PACKAGES += \
 	ninepatch-tests \
 	common-tests \
 	sdklib-tests \
-	sdkuilib-tests
+	sdkuilib-tests \
+	layoutlib-tests
 
 PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay