Merge "Installd: Add error message to dexopt" am: 0edada736b am: a6a9fe2b33
am: e79be50fa5

Change-Id: I360b3fd9f9d42b1c9595140f8c8cd88306fd2b5f