Revert "Revert "Make sure gapps are always pulled in""

This reverts commit 556bdb094381bb1cdea51396821f1db119214920.