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

Change-Id: I39b4221ab89b9bc352b0f139353cfb17e3235cf1