Merge "Add inet6AddressHolderClass JniConstant" am: 5b948ff3b3
am: 244985d098

Change-Id: I79401857354d023655f9e7c6e1783758eaec6c86