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

Change-Id: I223eadcdde524dd9eeda9c57225a082d8ade3e4e