Merge "Fix default method verifier check for compact dex"