Merge "netd: suppress dir write to /system"