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

Change-Id: Ieb70b6e7c4a4e64bb71e6cf75216e10c230a37b9