Handle gapps inclusion better

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>

Conflicts:
	configs/common.mk