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

Change-Id: I8b32fe8ad5a98e60ca353029cfa6933e59cee315