Merge "Change tetheroffloadjni to tetheringutilsjni" am: 3e16a10a3e am: 75b0369615

Change-Id: I913f33213bf208ef7733871222e57a21f0d460e6