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

Change-Id: Id0c5eb48e3a9d5454623de25526a2172baa115be