Merge "Ensure we select the right execution binary for all dexopt commands" am: 3e167da916
am: fefbbd7e13

Change-Id: Iee8b97e5bb8d52d7761d3f7748d9a4473d1fa0f3