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

Change-Id: I03a7e494e54b75c37c1f0097977fbd38dd34cd0c