Merge "Change tetheroffloadjni to tetheringutilsjni"
am: 3e16a10a3e

Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d