Add gapps to the build