revert previous commits

Change-Id: Ibb1247a6b81192ef7cc46e89d886fa4088c2ae68
plugins: fix static plugins for branded applications

Change-Id: I8ec944dc8f5ded0b19aa9a7130df95a600b83e04
Merge topic 'static-plugins-branding' into next

9344aaa9 plugins: fix static plugins for branded applications
7bde6e5a revert previous commits
plugins: fix static plugins for branded applications

Change-Id: I8ec944dc8f5ded0b19aa9a7130df95a600b83e04
Merge topic 'static-plugins-branding' into next

3e32977a plugins: fix static plugins for branded applications