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

Change-Id: I6887ec10db867a766765fe5d6fe95c5df2388522