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