Merge "Fix CtsNNAPIBenchmarkTestCases to only use one version of AJUR"