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

Change-Id: Ibae1ae806d632c8e08b6079abc8be5d326de5818