Merge changes Ib28f4fbf,I79c3b381

* changes:
  Don't lock around NetworkController methods.
  Make tun_interface a library so it can be used in VTS tests.