Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev
am: b730e36596

Change-Id: I3db9b04ff8cd9a1428dd4dd43ee3e73b6ec48695