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

Change-Id: I30833bd583640650c937cc9d9643fb5b09ad3886