Merge "fortify(socket/stat): emit diagnostics regardless of API level"
am: 803bd0a012

Change-Id: If020b068fa083c2aa1e0f0392f6400ceba025b3a