android_boot_bridge: Update to the newer Sony ELF changes

 * Header structure modified
 * libcutils dependencies reordered

Change-Id: I1d79d3443e03092f95a4df416e6a88a00c0262c4

Author: AdrianDC

bbootimg_bridge/Android.mk

@@ -14,7 +14,9 @@ LOCAL_MODULE_TAGS := eng
 
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)
-LOCAL_STATIC_LIBRARIES := libcutils libc libmultirom_static libbootimg
+LOCAL_STATIC_LIBRARIES := libc libmultirom_static libbootimg libcutils
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
+LOCAL_CFLAGS := -DDEBUG_KMSG
+
 include $(BUILD_EXECUTABLE)

bbootimg_bridge/bbootimg_bridge.c

@@ -83,7 +83,7 @@ int bbootimg_bridge(const char* import_path, const char* export_path)
     }
 
     strcpy((char*)img.hdr.cmdline, cmdline);
-    img.hdr_elf->cmd_size = strlen(cmdline);
+    img.hdr_info->cmdline_size = strlen(cmdline);
 
     strcpy(tmp, export_path);
     strcat(tmp, ".new");