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

Change-Id: I5686647a528dbeb8eaf4ba70fc1d47dd096713d8