goo support: apply to UNOFFICIAL builds

Change-Id: Ie865b0c65578e60652cfdf0c11357a83b3cda471