Revert "Add back gapps"

This reverts commit 6702c11983620b3a4e02d0ddb214d3b4f4608db7.