Re-enable wallpaper test
Revert "Revert "Remove media between tests, and push resources to storage for tests that require them""

This reverts commit a3a0a99539d5f3e05a3c5fee156a614f145e9c6f.
Only instantiate the device manager the first time it's needed
Only instantiate the device manager if the target is running an Android build (not desktop builds)
Change wait for test_video
Fixed up xfails in manifest files
Merge pull request #278 from davehunt/remove-media

Remove media (attempt #2)
Merge pull request #290 from davehunt/xfail-fix

Fixed up xfails in manifest files
Add sleep into test_create_alarm_label
Merge pull request #291 from zacc/hack_job_on_alarm_label_test

Add sleep into test_create_alarm_label
Merge pull request #289 from zacc/repair_camera_video_wait

Change wait for test_video
Merge remote-tracking branch 'upstream/master' into ref_radio_test

Conflicts:
	gaiatest/tests/manifest.ini