Clean up the use of profile_key / dex_locations
am: 4ba700af65

Change-Id: If61271ba563fefaa2cba5fab7a4c2672a54acf62