Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev
automerge: f34f376  -s ours

* commit 'f34f3767c43a7829b14da1267ff5fcbb03f9d617':
  Skip encoding tests for unsupported resolutions.