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

Change-Id: I774ef3ab433dcf0c53e573fbf32ba365aa5f199c