Merge commit 'f3377c64' into froyo-plus-aosp * commit 'f3377c64': Remove test runner tool vogar from Froyo.