Merge "Create secondary dex profiles relative to the provided dex path" am: f7f5732e2c am: 310bc2b571
am: 8ed29cdd59  -s ours

Change-Id: Ibdeee5ccb67da81afd649aca41764d5d5f2ec0cf