Revert "protobuf: work around a static analyzer bug" am: 2759c3c848 am: 4c69e012ac
am: 52c0200b5d

Change-Id: Ie4bbb17d580de7c0f752a61737ab10b55905b6ae