Merge "Change the location of current profiles for secondary dex files"