Merge "Change the location of current profiles for secondary dex files"
am: 80c3c70930

Change-Id: I5ece1daa5796915c0dc6d19e791a0e81c311feb7