Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."