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

Change-Id: I1060e62981950fa582e880d6aba6ca9e246587c3