1) Fix for bug 3413 - [GCCE] Namespace 'abi' not declared in e32test build.
2) Revert fix for bug 3389; fix for 3431 replaces it.
3) Correct typo in fix for bug 3391.
# component name "Template Variant"
component base_template
source \sf\os\kernelhwsrv\bsptemplate\asspandvariant\template_assp
source \sf\os\kernelhwsrv\bsptemplate\asspandvariant\template_variant
source \sf\os\kernelhwsrv\bsptemplate\asspandvariant\base_template.mrp
source \sf\os\kernelhwsrv\bsptemplate\asspandvariant\base_template.history.xml
source \sf\os\kernelhwsrv\bsptemplate\asspandvariant\distribution.policy.s60
binary \sf\os\kernelhwsrv\bsptemplate\asspandvariant\template_variant all
exports \sf\os\kernelhwsrv\bsptemplate\asspandvariant\template_variant
notes_source \component_defs\release.src
ipr E
ipr T \sf\os\kernelhwsrv\bsptemplate\asspandvariant\template_variant\test