am 2cb5207b: am 3ae8da0a: ART: Fix invalid access and DCHECK in verifier

* commit '2cb5207b85472c36f163a6980624e3936e5dc97c':
  ART: Fix invalid access and DCHECK in verifier

diff --cc runtime/verifier/method_verifier.cc
Simple merge

diff --cc test/800-smali/expected.txt
index 938cf5d,2196a88..7059b6b
--- 1/test/800-smali/expected.txt
--- 2/test/800-smali/expected.txt
+++ b/test/800-smali/expected.txt
@@@ -21,9 -19,8 +21,10 @@@ b/2186376
  b/21873167
  b/21614284
  b/21902684
 -b/21863767
 +b/22045582
 +b/22045582 (int)
 +b/22045582 (wide)
  b/21886894
  b/22080519
+ b/21645819
  Done!

diff --cc test/800-smali/src/Main.java
Simple merge