Merge "Minor shuffling of installd error reporting."
am: 991707a167

Change-Id: I34820e7997f70fea12c7b9d64999d419988317e2