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

Change-Id: I9faf2c007b741b6b4e8ff937b3e6ac3e9b7fd8f4