Merge "Fix all warnings and enable -Werror for gptfdisk." am: 2c054ab90e
am: 7424963b5b

Change-Id: Ib529d92396cc2c7ad482bd25e66f1adfc7f24b46