Update gapps.mk

Organize