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

Change-Id: I7ea174edd4db19845a7681eb3821b2911861ca73