Merge "Add ApiDemos to device-tests as it's needed by JankMicroBenchmarkTests"
am: 285aca0218

Change-Id: I496a8f3119ffa7c3762a932bffd255eaeb5d2e77