Merge changes from topic \'bad-classpath\' into nyc-dev
am: 9c13f5e

* commit '9c13f5e2e63e1c85c5bb79dc7b6545941c25567f':
  Make test 146 run with secondary dex file in classpath.
  Make InvokeInterfaceTrampoline check methods

Change-Id: I175c8dd60d1f036a2f5b69cae94e311e87a361e3