Merge "Temporarily turn off runtest's disabling of dalvik verifier"