Revert and fix GooUpdater

Change-Id: I29429e677ef8bba42a2b6eae7df2040027c31c77