Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev am: 3a02aee276
am: 008b037868

Change-Id: I593e906178212cae63bface6be9a3f56fad89c1b