Merge "Add test to verify dex file passed to agent"
am: ddacd7e580

Change-Id: I0879b24bd894166f383081b340f016501c2ed41a