Merge "don't skip omx video codecs for ATV S and below" into tm-dev