Merge "Fix CtsNNAPIBenchmarkTestCases to only use one version of AJUR" am: c6144d4bb1
am: 44e376bd40

Change-Id: I3561b6376626121588803e1ab3c3ec93c28cea3f