Merge "Fix typo in StagefrightPluginLoader"