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

Change-Id: I19aae31d2a31b8ccf6e8b9566a12b68aaff03dd1