change to new PluginManager
Merge branch 'crosswalk' into crosswalk_merge