Replace MakeGlobalVariablesScript hook with skin code

Change-Id: Iedfd758e171793da71312e25612889074e169267
Merge "Replace MakeGlobalVariablesScript hook with skin code"