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

Change-Id: I09887239d4aa23792014f00e4fa2389e186b43f0