Merge "Add UDP_ENCAP Constants to OsConstants.java"