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

Change-Id: I9f02f0b131324a99c96459d2dc2bbc0db13bf1b7