Merge "Revert "Revert "Move PlainDatagramSocketImpl away from JNI""" am: da2c0014a2 am: 6ea49ac3e5 am: 496e030837
am: 07f7fc5b0a

Change-Id: Iaa2d08f1c6bcb75ce13768ecce0f861358664fa0