Merge "Re-enable dex verifier after dexlayout"