Merge "Change tetheroffloadjni to tetheringutilsjni"
am: 0af9d37eca

Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d