diff --git a/envsetup.sh b/envsetup.sh
index 550dca86bb..3f5ce330a8 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -2045,6 +2045,13 @@ function showcommands() {
     fi
 }
 
+function avbtool() {
+    if [[ ! -f "$ANDROID_SOONG_HOST_OUT"/bin/avbtool ]]; then
+        m avbtool
+    fi
+    "$ANDROID_SOONG_HOST_OUT"/bin/avbtool $@
+}
+
 validate_current_shell
 source_vendorsetup
 addcompletions