Merge "Include sgdisk in all device builds."