Merge pull request #696 from jlipps/master

make sure androidmanifest is in /tmp
make sure device wakes up before trying to run test (fix #490)