Merge "statusToString: parenthesize strerror" am: b033ea31ad am: aca5fcae52

Change-Id: I009294b7a2dffdeb05478d81e7e0ba9c57dbc40c