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

Change-Id: I94a711a11155b6ee93b2997b82d2ffadce190a87