Bring in some improvements done previously
Bring in some improvements done previously

* Some changes were done to AOSP macaddrsetup when it was initially
  brought in for rhine, see http://review.cyanogenmod.org/117270
* Bring them in again, as they've been done after toying around
  with MAC address handling quite a bit, and settling on this,
  having tested multiple use cases

Change-Id: I5b2ec650e31f573874e37b4df9bd191e56cec6b8

sonyxperiadev/macaddrsetup,omnirom/android_hardware_sony_macaddrsetup