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

Change-Id: I1e55c0594cfb6fd4008184b5c366e5bc7eb5f74c