modify test framework
Merge branch 'master' of https://github.com/userfuy/android