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

Change-Id: If9eab4b100c80a50b9288fd3c47527c9058e3f8a