am 2e17ac46: Merge "Temporarily turn off runtest\'s disabling of dalvik verifier"

* commit '2e17ac46c8ce8195155475d123d59e85ff912a18':
  Temporarily turn off runtest's disabling of dalvik verifier