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

Change-Id: Ie58fbffc4818d693e87214add20daa5be558ed84