Move back reverted change, components fix required here
[xulrunner] Final merge with HG: cc80aa0c7c13, GIT: b8d69db
Merge remote-tracking branch 'tmeshkova/embedlite' into embedlite