dtbhtool: Rename unpackbootimg to avoid conflicts

Change-Id: Iee1146dc6eca01dc50ac3e41e0b12a41a33064c1
diff --git a/dtbhtool/Android.mk b/dtbhtool/Android.mk
index c60b2c5..d4bad52 100644
--- a/dtbhtool/Android.mk
+++ b/dtbhtool/Android.mk
@@ -21,7 +21,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := unpackbootimg.c
-LOCAL_MODULE := unpackbootimg
+LOCAL_MODULE := unpackdtbhbootimg
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -48,9 +48,9 @@
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := unpackbootimg.c
 LOCAL_STATIC_LIBRARIES := libcutils libc
-LOCAL_MODULE := utility_unpackbootimg
+LOCAL_MODULE := utility_unpackdtbhbootimg
 LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_STEM := unpackbootimg
+LOCAL_MODULE_STEM := unpackdtbhbootimg
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities