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

Change-Id: Ieac210bce7c3c0e8a9335b0525ce06b483302b4c