Merge "Revert "Revert "Move PlainDatagramSocketImpl away from JNI""" am: da2c0014 am: 6ea49ac3 am: 496e0308 am: 07f7fc5b Change-Id: Iaa2d08f1c6bcb75ce13768ecce0f861358664fa0