Merge "statusToString: parenthesize strerror"
am: b033ea31ad

Change-Id: I8fcb607cf3b24588bf873ca3ebe0c71ef9a790db