Updated testrunner to be compatibel with Android SDK r21.