Update and rename common.mk to gapps.mk