Merge "VTS: changes for qti encoder plugins" into qt-dev