Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-dev