Revert "Add back gapps"

This reverts commit ff111b8f8f398d5d8f3bde7d8555cd1b3e876296.