Merge "Add inet6AddressHolderClass JniConstant" am: 5b948ff3b3 am: 244985d098 am: 6478a0456f
am: 326aad8293

Change-Id: Idf32e576f7adfda9cfb5466a566e5c4157254499