Merge "arc: Fix CTS tests for grunt" into android11-tests-dev