Merge "Always pass --dex-location to profman"