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

Change-Id: If6b337b351ffa637da6fd52def6b937d250e5522