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

Change-Id: I253b0992a70be7d4af8eac0298d214902fd131ff