Merge "Skip class path checking for secondary dex files"