Merge "Change the location of current profiles for secondary dex files" am: 80c3c70930 am: babf30ed97  -s ours
am: 42884cf71d  -s ours

Change-Id: Id7947cf3c70f9bc2d0c176f2e52b2ced99cf9640