Merge "Return real error strings from installd."
am: 8f3ce2cd66

Change-Id: I2a5e1fa64f14e15b191e805e080489d078bcac70