Merge "set a proper SDK level for cts-test-runner"