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

Change-Id: I2ee450ff879b55e1e919e802a5811db94cd6a657