Merge "Add header that defines strerror()"
am: 7eca57a20e

Change-Id: Iaacd6a2d5c07970c1303eed0e005be0a75adf61e