Merge "Move NetFd.h to external/conscrypt."
am: 51588c82bd

Change-Id: I2a6d9b909f5aeb93c7f678ea722bc6b58b06a21f