Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev