Merge "Copy 'res' folder to device for run-tests"
am: b98747c267

Change-Id: Ib64ab59e868fbcd4eaed064aa087829eb34bb081