Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev am: 284b584499
am: b2963f3351

Change-Id: I6de5ec46a0d93de01acec80a43a8856ca74dc488