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

Change-Id: I28a9d146ad51298d1d9c668e71929e7695b5b2e1