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

Change-Id: I562a85ad7b36c91c4ea74b0745413388f6d6abd9