Merge "Skip secure decoders in C2 VTS" into qt-dev
am: ace31cd04a

Change-Id: If259ddc8bc8f0742867bf4f5ed3f9e8a51586bf1