Merge "VTS: changes for qti encoder plugins" into qt-dev am: 69f8d1a5f2
am: edadf35df3

Change-Id: Ia4c31ddac6f960b5773d666060fd7ede3f8f5ce1