Merge "Always pass --dex-location to profman"
am: 0d3c95ec56

Change-Id: I8f69353f952bbef117daa8e95811d369c05a304b