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

Change-Id: Ic88223e534db33207ccc22611ddd0d1c2895fd99