Merge changes Ie0e7d4f7,Ib1c58e49

* changes:
  Enable/disable current targets via soong var instead of inline.
  Make NetworkStack API shims available to Tethering.