Merge "Installd: deleteOdex's outputPath can be null" am: 0c189de962
am: 6f0d10dbde

Change-Id: Id73731fd8d7e2e67d17f9ac3599d27520849ac2c