Change-Id: Ia40d9f85303a52e20ca57acf13a0cfc8a9922024 Conflicts: runtime/verifier/method_verifier.cc (cherry-picked from commit fe1f7c84)