Merge "Better way to export variables in Common.mk"