Merge "Make test 146 run with secondary dex file in classpath." am: 1669fe3
am: 233a587

* commit '233a587e41101dc8de96d1942fbf7d10e97d31f0':
  Make test 146 run with secondary dex file in classpath.

Change-Id: I8f5f9615178d9184fa5ca692fd23408218783a80