Merge "Return real error strings from installd." am: 8f3ce2cd66 am: 6bd17e8e69 am: 7231e852a2
am: ee0d2ed9fa

Change-Id: Ia9f0bf02967d66e3bd39dc0e51cffd234a97c108