Merge changes from topic 'bad-classpath' into nyc-dev

* changes:
  Make test 146 run with secondary dex file in classpath.
  Make InvokeInterfaceTrampoline check methods