Merge "Return real error strings from installd."