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

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