Merge "Make test 146 run with secondary dex file in classpath."