am e6e09fd3: am f34f3767: Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev

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