Update testrunner libraries to work with Android SDK r21.