Merge "Add inet6AddressHolderClass JniConstant"
am: 5b948ff3b3

Change-Id: I4f53bdbaee968bf9f0530799975e048ba6a7c8fc