Merge "Add ApiDemos to device-tests as it's needed by JankMicroBenchmarkTests"