Check the correct goo folder for gapps

Change-Id: Ib55676bba2cb7d40b8eb5ee88c4f0cadcd7b8a96