Merge "Always pass --dex-location to profman" into pi-dev am: 7be03ead4c
am: 6e9f4df287

Change-Id: I77d44db27602b32bb3a9365eb531faf50dae27f1