Update to latest AOSP master
Merge in latest commits from AOSP master and fix merge conflicts
diff --git a/bootloader.h b/bootloader.h
index ead1d0b..0a682b2 100644
--- a/bootloader.h
+++ b/bootloader.h
@@ -48,10 +48,17 @@
/* Read and write the bootloader command from the "misc" partition.
* These return zero on success.
*/
+/*
int get_bootloader_message(struct bootloader_message *out);
int set_bootloader_message(const struct bootloader_message *in);
+*/
+void set_device_type(char new_type);
+void set_device_name(const char* new_name);
+
+int get_bootloader_message_mtd_name(struct bootloader_message *out);
int set_bootloader_message_mtd_name(const struct bootloader_message *in, const char* mtd_name);
+int get_bootloader_message_block_name(struct bootloader_message *out);
int set_bootloader_message_block_name(const struct bootloader_message *in, const char* block_name);
void get_args(int *argc, char ***argv);