[automerger skipped] Merge "Tethering: build tethering as unbundled APP" am:...
[automerger skipped] Merge "Tethering: build tethering as unbundled APP" am: ae03bdf7 am: e4d6debb am: 35747b60 -s ours
am skip reason: Change-Id I09117228c193137f6359fdcfced38352b8a38f57 with SHA-1 645058f9 is in history
Change-Id: Ica145b87a479505ca63921dd8d85a44b47d0c395