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

Change-Id: I9692054f68b8ed14248b130e3b751cfa57ebec11