Merge "Prune CtsNNAPIBenchmarkTestCases out of general-tests." am: dbcf36ad41 am: e2368701d5 am: 8a65af2730

Change-Id: Ia953e47d3f8aba84738c3179a60e698c6a9b0109