Bring Android VS Template in line with structure and functionality of XS Android template.