Merge "Test plans for aosp_$arch and gsi_$arch on S"