Merge "Installd: Check for dex2oatd before running it" am: a4d8dae190
am: 7a37fb6d9a

Change-Id: I495743c934349280e8b8f61725eaf09afa22c255