Rejoin mako to mk file hierarchy

ps2: fix gsm.mk path
ps3: use correct common config

Change-Id: I7596f45e9fc0f839a721b46771b99ffc42d53537