Merge "Fixing gtest failure due to VerifyClassUsingOatFile change" into dalvik-dev