Return some components to ^4 which disappeared and came back. Remove bad attributes in ^3 phonesrv.
source,dst,type,pattern,sysdef
http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,CompilerCompatibility,layers.sysdef.xml
http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,layers.sysdef.xml