Merge commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f' into eclair-mr2-plus-aosp * commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f': Fixing the build by renaming private "string.h" header file.
Merge commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f' into eclair-mr2-plus-aosp * commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f': Fixing the build by renaming private "string.h" header file.